diff --git a/moto/__init__.py b/moto/__init__.py index df283fc63..f1ae2ab66 100644 --- a/moto/__init__.py +++ b/moto/__init__.py @@ -31,3 +31,13 @@ from .sqs import mock_sqs # flake8: noqa from .sts import mock_sts # flake8: noqa from .route53 import mock_route53 # flake8: noqa from .swf import mock_swf # flake8: noqa + + +try: + # Need to monkey-patch botocore requests back to underlying urllib3 classes + from botocore.awsrequest import HTTPSConnectionPool, HTTPConnectionPool, HTTPConnection, VerifiedHTTPSConnection +except ImportError: + pass +else: + HTTPSConnectionPool.ConnectionCls = VerifiedHTTPSConnection + HTTPConnectionPool.ConnectionCls = HTTPConnection diff --git a/requirements-dev.txt b/requirements-dev.txt index a75fdcfb5..f2d5c6cfc 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -7,6 +7,6 @@ freezegun flask # botocore 1.3.29 breaks s3 in tests (lambda and s3 tests) # so we need to pin a boto3 and botocore revision pair that we know works -boto3==1.2.4 -botocore==1.3.28 +boto3 +botocore six