diff --git a/botocore/endpoint.py b/botocore/endpoint.py index 990a4b97..1fa1eef1 100644 --- a/botocore/endpoint.py +++ b/botocore/endpoint.py @@ -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 diff --git a/botocore/stub.py b/botocore/stub.py index 9413ba89..ca657b6c 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 ANY = object() diff --git a/debian/.git-dpm b/debian/.git-dpm index c31bbdb6..f33c2791 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -5c5e1a92b3d77902c86018008cf6a2e022eddd38 -5c5e1a92b3d77902c86018008cf6a2e022eddd38 +d362c7b19b96d362c91e754220245d197343943b +d362c7b19b96d362c91e754220245d197343943b af927425f0e0e7f91a231c785a0e888e66971644 af927425f0e0e7f91a231c785a0e888e66971644 python-botocore_1.4.60.orig.tar.gz diff --git a/debian/patches/0001-Don-t-use-duplicated-modules.patch b/debian/patches/0001-Don-t-use-duplicated-modules.patch index 53fbc5f9..3d82fbff 100644 --- a/debian/patches/0001-Don-t-use-duplicated-modules.patch +++ b/debian/patches/0001-Don-t-use-duplicated-modules.patch @@ -1,4 +1,4 @@ -From 58b7b506aa3d8f265d18cfa7211d3fa42712403c Mon Sep 17 00:00:00 2001 +From 9c646b991cffe67a2de513866b915439e08d907a Mon Sep 17 00:00:00 2001 From: TANIGUCHI Takaki Date: Tue, 24 Nov 2015 20:40:16 +0900 Subject: Don't use duplicated modules @@ -7,11 +7,12 @@ fix path --- botocore/awsrequest.py | 12 ++++++------ botocore/compat.py | 4 ++-- - botocore/endpoint.py | 12 ++++++------ + botocore/endpoint.py | 14 +++++++------- botocore/exceptions.py | 2 +- botocore/retryhandler.py | 4 ++-- + botocore/stub.py | 2 +- botocore/utils.py | 2 +- - 6 files changed, 18 insertions(+), 18 deletions(-) + 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/botocore/awsrequest.py b/botocore/awsrequest.py index a667bb5..1329c8a 100644 @@ -56,7 +57,7 @@ index dbd5113..b5bcaa0 100644 logger = logging.getLogger(__name__) diff --git a/botocore/endpoint.py b/botocore/endpoint.py -index 228d43d..990a4b9 100644 +index 228d43d..1fa1eef 100644 --- a/botocore/endpoint.py +++ b/botocore/endpoint.py @@ -17,11 +17,11 @@ import logging @@ -76,6 +77,15 @@ index 228d43d..990a4b9 100644 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. @@ -113,6 +123,19 @@ index 09b59e5..58913ec 100644 from botocore.exceptions import ChecksumError, EndpointConnectionError +diff --git a/botocore/stub.py b/botocore/stub.py +index 9413ba8..ca657b6 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 + + + ANY = object() diff --git a/botocore/utils.py b/botocore/utils.py index 6218b8a..4339acd 100644 --- a/botocore/utils.py diff --git a/debian/patches/0002-Don-t-use-duplicated-modules-in-tests.patch b/debian/patches/0002-Don-t-use-duplicated-modules-in-tests.patch index 8a2638cb..90eea064 100644 --- a/debian/patches/0002-Don-t-use-duplicated-modules-in-tests.patch +++ b/debian/patches/0002-Don-t-use-duplicated-modules-in-tests.patch @@ -1,4 +1,4 @@ -From 5c5e1a92b3d77902c86018008cf6a2e022eddd38 Mon Sep 17 00:00:00 2001 +From d362c7b19b96d362c91e754220245d197343943b Mon Sep 17 00:00:00 2001 From: TANIGUCHI Takaki Date: Tue, 24 Nov 2015 21:34:20 +0900 Subject: Don't use duplicated modules (in tests) @@ -13,7 +13,8 @@ Subject: Don't use duplicated modules (in tests) tests/unit/test_endpoint.py | 2 +- tests/unit/test_response.py | 2 +- tests/unit/test_retryhandler.py | 4 ++-- - 9 files changed, 15 insertions(+), 15 deletions(-) + tests/unit/test_utils.py | 2 +- + 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/integration/test_glacier.py b/tests/integration/test_glacier.py index 23a7f34..96cedf0 100644 @@ -162,3 +163,16 @@ index 3f31a69..a6f05b8 100644 from botocore import retryhandler from botocore.exceptions import ChecksumError +diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py +index 5d5cd85..2feee5e 100644 +--- a/tests/unit/test_utils.py ++++ b/tests/unit/test_utils.py +@@ -25,7 +25,7 @@ from botocore.exceptions import InvalidExpressionError, ConfigNotFound + from botocore.exceptions import ClientError + from botocore.exceptions import InvalidDNSNameError, MetadataRetrievalError + from botocore.model import ServiceModel +-from botocore.vendored import requests ++import requests + from botocore.utils import remove_dot_segments + from botocore.utils import normalize_url_path + from botocore.utils import validate_jmespath_for_set diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index 5d5cd852..2feee5ee 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -25,7 +25,7 @@ from botocore.exceptions import InvalidExpressionError, ConfigNotFound from botocore.exceptions import ClientError from botocore.exceptions import InvalidDNSNameError, MetadataRetrievalError from botocore.model import ServiceModel -from botocore.vendored import requests +import requests from botocore.utils import remove_dot_segments from botocore.utils import normalize_url_path from botocore.utils import validate_jmespath_for_set