diff --git a/tests/integration/test_glacier.py b/tests/integration/test_glacier.py index 23a7f348..96cedf0d 100644 --- a/tests/integration/test_glacier.py +++ b/tests/integration/test_glacier.py @@ -13,7 +13,7 @@ from tests import unittest from botocore.exceptions import ClientError -from botocore.vendored import six +import six import botocore.session diff --git a/tests/integration/test_s3.py b/tests/integration/test_s3.py index 83e2cc20..89994a4b 100644 --- a/tests/integration/test_s3.py +++ b/tests/integration/test_s3.py @@ -24,13 +24,13 @@ from contextlib import closing from nose.plugins.attrib import attr -from botocore.vendored.requests import adapters -from botocore.vendored.requests.exceptions import ConnectionError +from requests import adapters +from requests.exceptions import ConnectionError from botocore.compat import six, zip_longest import botocore.session import botocore.auth import botocore.credentials -import botocore.vendored.requests as requests +import requests from botocore.config import Config from botocore.exceptions import ClientError @@ -777,7 +777,7 @@ class TestS3SigV4Client(BaseS3ClientTest): raise ConnectionError("Simulated ConnectionError raised.") else: return original_send(self, *args, **kwargs) - with mock.patch('botocore.vendored.requests.adapters.HTTPAdapter.send', + with mock.patch('requests.adapters.HTTPAdapter.send', mock_http_adapter_send): response = self.client.put_object(Bucket=self.bucket_name, Key='foo.txt', Body=body) diff --git a/tests/integration/test_smoke.py b/tests/integration/test_smoke.py index 1a475ede..b8b30e57 100644 --- a/tests/integration/test_smoke.py +++ b/tests/integration/test_smoke.py @@ -19,8 +19,8 @@ from nose.tools import assert_equals, assert_true from botocore import xform_name import botocore.session from botocore.client import ClientError -from botocore.vendored.requests import adapters -from botocore.vendored.requests.exceptions import ConnectionError +from requests import adapters +from requests.exceptions import ConnectionError # Mapping of service -> api calls to try. @@ -292,7 +292,7 @@ def _make_client_call_with_errors(client, operation_name, kwargs): raise ConnectionError("Simulated ConnectionError raised.") else: return original_send(self, *args, **kwargs) - with mock.patch('botocore.vendored.requests.adapters.HTTPAdapter.send', + with mock.patch('requests.adapters.HTTPAdapter.send', mock_http_adapter_send): try: response = operation(**kwargs) diff --git a/tests/unit/auth/test_signers.py b/tests/unit/auth/test_signers.py index f084576e..aa140d33 100644 --- a/tests/unit/auth/test_signers.py +++ b/tests/unit/auth/test_signers.py @@ -25,7 +25,7 @@ import botocore.auth import botocore.credentials from botocore.compat import HTTPHeaders, urlsplit, parse_qs, six from botocore.awsrequest import AWSRequest -from botocore.vendored.requests.models import Request +from requests.models import Request class BaseTestWithFixedDate(unittest.TestCase): diff --git a/tests/unit/response_parsing/test_response_parsing.py b/tests/unit/response_parsing/test_response_parsing.py index 97249d69..afa6474d 100644 --- a/tests/unit/response_parsing/test_response_parsing.py +++ b/tests/unit/response_parsing/test_response_parsing.py @@ -20,7 +20,7 @@ import difflib from tests import unittest, create_session from mock import Mock -from botocore.vendored.requests.structures import CaseInsensitiveDict +from requests.structures import CaseInsensitiveDict import botocore.session from botocore import xform_name diff --git a/tests/unit/test_awsrequest.py b/tests/unit/test_awsrequest.py index d37aa24d..e43d6270 100644 --- a/tests/unit/test_awsrequest.py +++ b/tests/unit/test_awsrequest.py @@ -418,7 +418,7 @@ class TestAWSHTTPConnection(unittest.TestCase): conn.sock = s # Test that the standard library method was used by patching out # the ``_tunnel`` method and seeing if the std lib method was called. - with patch('botocore.vendored.requests.packages.urllib3.connection.' + with patch('requests.packages.urllib3.connection.' 'HTTPConnection._tunnel') as mock_tunnel: conn._tunnel() self.assertTrue(mock_tunnel.called) diff --git a/tests/unit/test_endpoint.py b/tests/unit/test_endpoint.py index b7f9cbf5..038a3b7d 100644 --- a/tests/unit/test_endpoint.py +++ b/tests/unit/test_endpoint.py @@ -15,7 +15,7 @@ from tests import unittest from mock import Mock, patch, sentinel from nose.tools import assert_equals -from botocore.vendored.requests import ConnectionError +from requests import ConnectionError from botocore.compat import six from botocore.awsrequest import AWSRequest diff --git a/tests/unit/test_response.py b/tests/unit/test_response.py index 7b2eb259..35d07c80 100644 --- a/tests/unit/test_response.py +++ b/tests/unit/test_response.py @@ -20,7 +20,7 @@ import botocore from botocore import response from botocore.compat import six from botocore.exceptions import IncompleteReadError -from botocore.vendored.requests.models import Response, Request +from requests.models import Response, Request XMLBODY1 = (b'' b'AccessDenied' diff --git a/tests/unit/test_retryhandler.py b/tests/unit/test_retryhandler.py index 3f31a69f..a6f05b8b 100644 --- a/tests/unit/test_retryhandler.py +++ b/tests/unit/test_retryhandler.py @@ -16,8 +16,8 @@ from tests import unittest import mock -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 import retryhandler from botocore.exceptions import ChecksumError