Skip to content

Commit 6446d00

Browse files
committed
Drop boto 2 support
1 parent d6bded1 commit 6446d00

File tree

5 files changed

+4
-123
lines changed

5 files changed

+4
-123
lines changed

docs/contributing.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ This will run only tests that look like ``test_status_code`` or
103103
``test_gzip`` in the test suite, and only in the python 3.8 environment
104104
that has ``requests`` installed.
105105

106-
Also, in order for the boto tests to run, you will need an AWS key.
107-
Refer to the `boto
108-
documentation <https://boto.readthedocs.io/en/latest/getting_started.html>`__
109-
for how to set this up. I have marked the boto tests as optional in
106+
Also, in order for the boto3 tests to run, you will need an AWS key.
107+
Refer to the `boto3
108+
documentation <https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/index.html>`__
109+
for how to set this up. I have marked the boto3 tests as optional in
110110
Travis so you don't have to worry about them failing if you submit a
111111
pull request.
112112

docs/installation.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ VCR.py supports Python 3.8+, and `pypy <http://pypy.org>`__.
1414
The following HTTP libraries are supported:
1515

1616
- ``aiohttp``
17-
- ``boto``
1817
- ``boto3``
1918
- ``http.client``
2019
- ``httplib2``

tests/integration/test_boto.py

Lines changed: 0 additions & 82 deletions
This file was deleted.

vcr/patch.py

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,6 @@
6767
_HTTPSConnectionWithTimeout = httplib2.HTTPSConnectionWithTimeout
6868
_SCHEME_TO_CONNECTION = httplib2.SCHEME_TO_CONNECTION
6969

70-
# Try to save the original types for boto
71-
try:
72-
import boto.https_connection
73-
except ImportError: # pragma: no cover
74-
pass
75-
else:
76-
_CertValidatingHTTPSConnection = boto.https_connection.CertValidatingHTTPSConnection
77-
7870
# Try to save the original types for Tornado
7971
try:
8072
import tornado.simple_httpclient
@@ -126,7 +118,6 @@ def build(self):
126118
self._boto3(),
127119
self._urllib3(),
128120
self._httplib2(),
129-
self._boto(),
130121
self._tornado(),
131122
self._aiohttp(),
132123
self._httpx(),
@@ -274,17 +265,6 @@ def _httplib2(self):
274265
"https": VCRHTTPSConnectionWithTimeout,
275266
}
276267

277-
@_build_patchers_from_mock_triples_decorator
278-
def _boto(self):
279-
try:
280-
import boto.https_connection as cpool
281-
except ImportError: # pragma: no cover
282-
pass
283-
else:
284-
from .stubs.boto_stubs import VCRCertValidatingHTTPSConnection
285-
286-
yield cpool, "CertValidatingHTTPSConnection", VCRCertValidatingHTTPSConnection
287-
288268
@_build_patchers_from_mock_triples_decorator
289269
def _tornado(self):
290270
try:
@@ -447,13 +427,6 @@ def reset_patchers():
447427
yield mock.patch.object(cpool, "HTTPSConnectionWithTimeout", _HTTPSConnectionWithTimeout)
448428
yield mock.patch.object(cpool, "SCHEME_TO_CONNECTION", _SCHEME_TO_CONNECTION)
449429

450-
try:
451-
import boto.https_connection as cpool
452-
except ImportError: # pragma: no cover
453-
pass
454-
else:
455-
yield mock.patch.object(cpool, "CertValidatingHTTPSConnection", _CertValidatingHTTPSConnection)
456-
457430
try:
458431
import tornado.simple_httpclient as simple
459432
except ImportError: # pragma: no cover

vcr/stubs/boto_stubs.py

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)