[Python-modules-commits] [python-botocore] 01/03: Don't use duplicated modules

[Takaki Taniguchi]

This is an automated email from the git hooks/post-receive script.

takaki pushed a commit to branch patch-queue/master
in repository python-botocore.

commit 00d9534b65702aca30bf7519916181f82e228188
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Tue Nov 24 20:40:16 2015 +0900

    Don't use duplicated modules
    
    fix path
    
    Gbp-Pq: Name 0001-Don-t-use-duplicated-modules.patch
---
 botocore/awsrequest.py   | 12 ++++++------
 botocore/compat.py       |  6 +++---
 botocore/endpoint.py     | 14 +++++++-------
 botocore/exceptions.py   |  2 +-
 botocore/retryhandler.py |  4 ++--
 botocore/stub.py         |  2 +-
 botocore/utils.py        |  2 +-
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/botocore/awsrequest.py b/botocore/awsrequest.py
index c26ebc0..f1083af 100644
--- a/botocore/awsrequest.py
+++ b/botocore/awsrequest.py
@@ -23,15 +23,15 @@ from botocore.compat import HTTPHeaders, HTTPResponse, urlunsplit, urlsplit,\
     urlparse
 from botocore.exceptions import UnseekableStreamError
 from botocore.utils import percent_encode_sequence
-from botocore.vendored.requests import models
-from botocore.vendored.requests.sessions import REDIRECT_STATI
-from botocore.vendored.requests.packages.urllib3.connection import \
+from requests import models
+from requests.sessions import REDIRECT_STATI
+from urllib3.connection import \
     VerifiedHTTPSConnection
-from botocore.vendored.requests.packages.urllib3.connection import \
+from urllib3.connection import \
     HTTPConnection
-from botocore.vendored.requests.packages.urllib3.connectionpool import \
+from urllib3.connectionpool import \
     HTTPConnectionPool
-from botocore.vendored.requests.packages.urllib3.connectionpool import \
+from urllib3.connectionpool import \
     HTTPSConnectionPool
 
 
diff --git a/botocore/compat.py b/botocore/compat.py
index 0180df4..980de8d 100644
--- a/botocore/compat.py
+++ b/botocore/compat.py
@@ -19,15 +19,15 @@ import warnings
 import hashlib
 import logging
 
-from botocore.vendored import six
+import six
 from botocore.exceptions import MD5UnavailableError
-from botocore.vendored.requests.packages.urllib3 import exceptions
+from urllib3 import exceptions
 
 logger = logging.getLogger(__name__)
 
 
 if six.PY3:
-    from botocore.vendored.six.moves import http_client
+    from six.moves import http_client
 
     class HTTPHeaders(http_client.HTTPMessage):
         pass
diff --git a/botocore/endpoint.py b/botocore/endpoint.py
index 64ccfbd..1dc21fe 100644
--- a/botocore/endpoint.py
+++ b/botocore/endpoint.py
@@ -17,11 +17,11 @@ import logging
 import time
 import threading
 
-from botocore.vendored.requests.adapters import HTTPAdapter
-from botocore.vendored.requests.sessions import Session
-from botocore.vendored.requests.utils import get_environ_proxies
-from botocore.vendored.requests.exceptions import ConnectionError
-from botocore.vendored import six
+from requests.adapters import HTTPAdapter
+from requests.sessions import Session
+from requests.utils import get_environ_proxies
+from requests.exceptions import ConnectionError
+import six
 
 from botocore.awsrequest import create_request_object
 from botocore.exceptions import UnknownEndpointError
@@ -40,7 +40,7 @@ MAX_POOL_CONNECTIONS = 10
 filter_ssl_warnings()
 
 try:
-    from botocore.vendored.requests.packages.urllib3.contrib import pyopenssl
+    from urllib3.contrib import pyopenssl
     pyopenssl.extract_from_urllib3()
 except ImportError:
     pass
@@ -52,7 +52,7 @@ def convert_to_response_dict(http_response, operation_model):
     This converts the requests library's HTTP response object to
     a dictionary.
 
-    :type http_response: botocore.vendored.requests.model.Response
+    :type http_response: requests.model.Response
     :param http_response: The HTTP response from an AWS service request.
 
     :rtype: dict
diff --git a/botocore/exceptions.py b/botocore/exceptions.py
index d28b3bb..9ef7a72 100644
--- a/botocore/exceptions.py
+++ b/botocore/exceptions.py
@@ -12,7 +12,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 from __future__ import unicode_literals
-from botocore.vendored.requests.exceptions import ConnectionError
+from requests.exceptions import ConnectionError
 
 
 class BotoCoreError(Exception):
diff --git a/botocore/retryhandler.py b/botocore/retryhandler.py
index 09b59e5..58913ec 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, EndpointConnectionError
 
diff --git a/botocore/stub.py b/botocore/stub.py
index 85f8f9e..5432d0b 100644
--- a/botocore/stub.py
+++ b/botocore/stub.py
@@ -17,7 +17,7 @@ from pprint import pformat
 from botocore.validate import validate_parameters
 from botocore.exceptions import ParamValidationError, \
     StubResponseError, StubAssertionError
-from botocore.vendored.requests.models import Response
+from requests.models import Response
 
 
 class _ANY(object):
diff --git a/botocore/utils.py b/botocore/utils.py
index 59cf349..59d76fa 100644
--- a/botocore/utils.py
+++ b/botocore/utils.py
@@ -28,7 +28,7 @@ from botocore.exceptions import InvalidExpressionError, ConfigNotFound
 from botocore.exceptions import InvalidDNSNameError, ClientError
 from botocore.exceptions import MetadataRetrievalError
 from botocore.compat import json, quote, zip_longest, urlsplit, urlunsplit
-from botocore.vendored import requests
+import requests
 from botocore.compat import OrderedDict, six
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-botocore.git