mirror of
https://github.com/kevin1024/vcrpy.git
synced 2025-12-09 01:03:24 +00:00
hasattr check for requests 2.0 use cassette added type for httplib2 dictionary patch.
This commit is contained in:
47
vcr/patch.py
47
vcr/patch.py
@@ -1,6 +1,4 @@
|
|||||||
'''Utilities for patching in cassettes'''
|
'''Utilities for patching in cassettes'''
|
||||||
import types
|
|
||||||
|
|
||||||
import contextlib2
|
import contextlib2
|
||||||
import mock
|
import mock
|
||||||
|
|
||||||
@@ -81,13 +79,20 @@ def build_patchers(cassette):
|
|||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
from .stubs.requests_stubs import VCRRequestsHTTPConnection, VCRRequestsHTTPSConnection
|
from .stubs.requests_stubs import VCRRequestsHTTPConnection, VCRRequestsHTTPSConnection
|
||||||
|
|
||||||
# patch requests v1.x
|
# patch requests v1.x
|
||||||
yield mock.patch.object(cpool, 'VerifiedHTTPSConnection', cassette_subclass(VCRRequestsHTTPSConnection, cassette))
|
yield mock.patch.object(cpool, 'VerifiedHTTPSConnection',
|
||||||
yield mock.patch.object(cpool, 'HTTPConnection', cassette_subclass(VCRRequestsHTTPConnection, cassette))
|
cassette_subclass(VCRRequestsHTTPSConnection, cassette))
|
||||||
|
yield mock.patch.object(cpool, 'HTTPConnection',
|
||||||
|
cassette_subclass(VCRRequestsHTTPConnection, cassette))
|
||||||
yield mock.patch.object(cpool, 'HTTPConnection', _VCRHTTPConnection)
|
yield mock.patch.object(cpool, 'HTTPConnection', _VCRHTTPConnection)
|
||||||
|
|
||||||
# patch requests v2.x
|
# patch requests v2.x
|
||||||
yield mock.patch.object(cpool.HTTPConnectionPool, 'ConnectionCls', cassette_subclass(VCRRequestsHTTPConnection, cassette))
|
if hasattr(cpool.HTTPConnectionPool, 'ConnectionCls'):
|
||||||
yield mock.patch.object(cpool.HTTPSConnectionPool, 'ConnectionCls', cassette_subclass(VCRRequestsHTTPSConnection, cassette))
|
yield mock.patch.object(cpool.HTTPConnectionPool, 'ConnectionCls',
|
||||||
|
cassette_subclass(VCRRequestsHTTPConnection, cassette))
|
||||||
|
yield mock.patch.object(cpool.HTTPSConnectionPool, 'ConnectionCls',
|
||||||
|
cassette_subclass(VCRRequestsHTTPSConnection, cassette))
|
||||||
|
|
||||||
# patch urllib3
|
# patch urllib3
|
||||||
try:
|
try:
|
||||||
@@ -96,7 +101,8 @@ def build_patchers(cassette):
|
|||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
from .stubs.urllib3_stubs import VCRVerifiedHTTPSConnection
|
from .stubs.urllib3_stubs import VCRVerifiedHTTPSConnection
|
||||||
yield mock.patch.object(cpool, 'VerifiedHTTPSConnection', cassette_subclass(VCRVerifiedHTTPSConnection, cassette))
|
yield mock.patch.object(cpool, 'VerifiedHTTPSConnection',
|
||||||
|
cassette_subclass(VCRVerifiedHTTPSConnection, cassette))
|
||||||
yield mock.patch.object(cpool, 'HTTPConnection', _VCRHTTPConnection)
|
yield mock.patch.object(cpool, 'HTTPConnection', _VCRHTTPConnection)
|
||||||
|
|
||||||
# patch httplib2
|
# patch httplib2
|
||||||
@@ -107,9 +113,17 @@ def build_patchers(cassette):
|
|||||||
else:
|
else:
|
||||||
from .stubs.httplib2_stubs import VCRHTTPConnectionWithTimeout
|
from .stubs.httplib2_stubs import VCRHTTPConnectionWithTimeout
|
||||||
from .stubs.httplib2_stubs import VCRHTTPSConnectionWithTimeout
|
from .stubs.httplib2_stubs import VCRHTTPSConnectionWithTimeout
|
||||||
yield mock.patch.object(cpool, 'HTTPConnectionWithTimeout', cassette_subclass(VCRHTTPConnectionWithTimeout, cassette))
|
_VCRHTTPConnectionWithTimeout = cassette_subclass(VCRHTTPConnectionWithTimeout,
|
||||||
yield mock.patch.object(cpool, 'HTTPSConnectionWithTimeout', cassette_subclass(VCRHTTPSConnectionWithTimeout, cassette))
|
cassette)
|
||||||
yield mock.patch.object(cpool, 'SCHEME_TO_CONNECTION', {'http': VCRHTTPConnectionWithTimeout, 'https': VCRHTTPSConnectionWithTimeout})
|
_VCRHTTPSConnectionWithTimeout = cassette_subclass(VCRHTTPSConnectionWithTimeout,
|
||||||
|
cassette)
|
||||||
|
yield mock.patch.object(cpool, 'HTTPConnectionWithTimeout',
|
||||||
|
_VCRHTTPConnectionWithTimeout)
|
||||||
|
yield mock.patch.object(cpool, 'HTTPSConnectionWithTimeout',
|
||||||
|
_VCRHTTPSConnectionWithTimeout)
|
||||||
|
yield mock.patch.object(cpool, 'SCHEME_TO_CONNECTION',
|
||||||
|
{'http': _VCRHTTPConnectionWithTimeout,
|
||||||
|
'https': _VCRHTTPSConnectionWithTimeout})
|
||||||
|
|
||||||
# patch boto
|
# patch boto
|
||||||
try:
|
try:
|
||||||
@@ -118,7 +132,8 @@ def build_patchers(cassette):
|
|||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
from .stubs.boto_stubs import VCRCertValidatingHTTPSConnection
|
from .stubs.boto_stubs import VCRCertValidatingHTTPSConnection
|
||||||
yield mock.patch.object(cpool, 'CertValidatingHTTPSConnection', cassette_subclass(VCRCertValidatingHTTPSConnection, cassette))
|
yield mock.patch.object(cpool, 'CertValidatingHTTPSConnection',
|
||||||
|
cassette_subclass(VCRCertValidatingHTTPSConnection, cassette))
|
||||||
|
|
||||||
|
|
||||||
def reset_patchers():
|
def reset_patchers():
|
||||||
@@ -133,9 +148,11 @@ def reset_patchers():
|
|||||||
yield mock.patch.object(cpool, 'VerifiedHTTPSConnection', _VerifiedHTTPSConnection)
|
yield mock.patch.object(cpool, 'VerifiedHTTPSConnection', _VerifiedHTTPSConnection)
|
||||||
yield mock.patch.object(cpool, 'HTTPConnection', _cpoolHTTPConnection)
|
yield mock.patch.object(cpool, 'HTTPConnection', _cpoolHTTPConnection)
|
||||||
# unpatch requests v2.x
|
# unpatch requests v2.x
|
||||||
yield mock.patch.object(cpool.HTTPConnectionPool, 'ConnectionCls', _cpoolHTTPConnection)
|
yield mock.patch.object(cpool.HTTPConnectionPool, 'ConnectionCls',
|
||||||
|
_cpoolHTTPConnection)
|
||||||
yield mock.patch.object(cpool, 'HTTPSConnection', _cpoolHTTPSConnection)
|
yield mock.patch.object(cpool, 'HTTPSConnection', _cpoolHTTPSConnection)
|
||||||
yield mock.patch.object(cpool.HTTPSConnectionPool, 'ConnectionCls', _cpoolHTTPSConnection)
|
yield mock.patch.object(cpool.HTTPSConnectionPool, 'ConnectionCls',
|
||||||
|
_cpoolHTTPSConnection)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import urllib3.connectionpool as cpool
|
import urllib3.connectionpool as cpool
|
||||||
@@ -162,7 +179,9 @@ def reset_patchers():
|
|||||||
except ImportError: # pragma: no cover
|
except ImportError: # pragma: no cover
|
||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
yield mock.patch.object(cpool, 'CertValidatingHTTPSConnection', _CertValidatingHTTPSConnection)
|
yield mock.patch.object(cpool, 'CertValidatingHTTPSConnection',
|
||||||
|
_CertValidatingHTTPSConnection)
|
||||||
|
|
||||||
|
|
||||||
@contextlib2.contextmanager
|
@contextlib2.contextmanager
|
||||||
def force_reset():
|
def force_reset():
|
||||||
|
|||||||
Reference in New Issue
Block a user