96 lines
3.3 KiB
Diff
96 lines
3.3 KiB
Diff
From cb67f78430fcc49b14b8c74d60f1d99e75c59c26 Mon Sep 17 00:00:00 2001
|
|
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
Date: Fri, 25 Jul 2014 15:21:22 +0200
|
|
Subject: [PATCH] Do not use bundled requests
|
|
|
|
---
|
|
botocore.egg-info/requires.txt | 2 +-
|
|
botocore/awsrequest.py | 12 ++++++------
|
|
botocore/endpoint.py | 4 ++--
|
|
botocore/retryhandler.py | 4 ++--
|
|
botocore/utils.py | 2 +-
|
|
5 files changed, 12 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/botocore.egg-info/requires.txt b/botocore.egg-info/requires.txt
|
|
index 4f44845..63b8ff4 100644
|
|
--- a/botocore.egg-info/requires.txt
|
|
+++ b/botocore.egg-info/requires.txt
|
|
@@ -1,3 +1,3 @@
|
|
six>=1.1.0
|
|
jmespath==0.4.1
|
|
-python-dateutil>=2.1
|
|
\ No newline at end of file
|
|
+python-dateutil>=1.5
|
|
\ No newline at end of file
|
|
diff --git a/botocore/awsrequest.py b/botocore/awsrequest.py
|
|
index 1e848b3..527f578 100644
|
|
--- a/botocore/awsrequest.py
|
|
+++ b/botocore/awsrequest.py
|
|
@@ -17,14 +17,14 @@ import functools
|
|
import inspect
|
|
|
|
import six
|
|
-from botocore.vendored.requests import models
|
|
-from botocore.vendored.requests.sessions import REDIRECT_STATI
|
|
+from requests import models
|
|
+from requests.sessions import REDIRECT_STATI
|
|
from botocore.compat import HTTPHeaders, file_type, HTTPResponse
|
|
from botocore.exceptions import UnseekableStreamError
|
|
-from botocore.vendored.requests.packages.urllib3.connection import VerifiedHTTPSConnection
|
|
-from botocore.vendored.requests.packages.urllib3.connection import HTTPConnection
|
|
-from botocore.vendored.requests.packages.urllib3.connectionpool import HTTPConnectionPool
|
|
-from botocore.vendored.requests.packages.urllib3.connectionpool import HTTPSConnectionPool
|
|
+from urllib3.connection import VerifiedHTTPSConnection
|
|
+from urllib3.connection import HTTPConnection
|
|
+from urllib3.connectionpool import HTTPConnectionPool
|
|
+from urllib3.connectionpool import HTTPSConnectionPool
|
|
|
|
|
|
logger = logging.getLogger(__name__)
|
|
diff --git a/botocore/endpoint.py b/botocore/endpoint.py
|
|
index 28555a6..e718f54 100644
|
|
--- a/botocore/endpoint.py
|
|
+++ b/botocore/endpoint.py
|
|
@@ -17,8 +17,8 @@ import logging
|
|
import time
|
|
import threading
|
|
|
|
-from botocore.vendored.requests.sessions import Session
|
|
-from botocore.vendored.requests.utils import get_environ_proxies
|
|
+from requests.sessions import Session
|
|
+from requests.utils import get_environ_proxies
|
|
import six
|
|
|
|
import botocore.response
|
|
diff --git a/botocore/retryhandler.py b/botocore/retryhandler.py
|
|
index 857916e..5a42db3 100644
|
|
--- a/botocore/retryhandler.py
|
|
+++ b/botocore/retryhandler.py
|
|
@@ -17,8 +17,8 @@ import functools
|
|
import logging
|
|
from binascii import crc32
|
|
|
|
-from botocore.vendored.requests import ConnectionError, Timeout
|
|
-from botocore.vendored.requests.packages.urllib3.exceptions import ClosedPoolError
|
|
+from requests import ConnectionError, Timeout
|
|
+from urllib3.exceptions import ClosedPoolError
|
|
|
|
from botocore.exceptions import ChecksumError
|
|
|
|
diff --git a/botocore/utils.py b/botocore/utils.py
|
|
index 95b8757..2139284 100644
|
|
--- a/botocore/utils.py
|
|
+++ b/botocore/utils.py
|
|
@@ -16,7 +16,7 @@ from six import string_types, text_type
|
|
|
|
from botocore.exceptions import InvalidExpressionError, ConfigNotFound
|
|
from botocore.compat import json, quote
|
|
-from botocore.vendored import requests
|
|
+import requests
|
|
|
|
|
|
logger = logging.getLogger(__name__)
|
|
--
|
|
1.8.3.1
|
|
|