Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #556 from spulec/fixboto

Browse Source 
Fixboto
This commit is contained in:
Steve Pulec 2016-03-02 15:39:49 -05:00
commit 630c668651
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
moto/__init__.py
View File

@ -31,3 +31,13 @@ from .sqs import mock_sqs # flake8: noqa
from .sts import mock_sts # flake8: noqa from .sts import mock_sts # flake8: noqa
from .route53 import mock_route53 # flake8: noqa from .route53 import mock_route53 # flake8: noqa
from .swf import mock_swf # 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

4
requirements-dev.txt
View File

@ -7,6 +7,6 @@ freezegun
flask flask
# botocore 1.3.29 breaks s3 in tests (lambda and s3 tests) # 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 # so we need to pin a boto3 and botocore revision pair that we know works
boto3==1.2.4 boto3
botocore==1.3.28 botocore
six six