Possible fix
This commit is contained in:
parent
35a69d9f61
commit
d145b5dc18
@ -103,6 +103,12 @@ try: # pragma: no cover
|
|||||||
except ImportError: # pragma: no cover
|
except ImportError: # pragma: no cover
|
||||||
ssl = None
|
ssl = None
|
||||||
|
|
||||||
|
try: # pragma: no cover
|
||||||
|
from requests.packages.urllib3.contrib.pyopenssl import inject_into_urllib3, extract_from_urllib3
|
||||||
|
pyopenssl_override = True
|
||||||
|
except:
|
||||||
|
pyopenssl_override = False
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_HTTP_PORTS = frozenset([80])
|
DEFAULT_HTTP_PORTS = frozenset([80])
|
||||||
POTENTIAL_HTTP_PORTS = set(DEFAULT_HTTP_PORTS)
|
POTENTIAL_HTTP_PORTS = set(DEFAULT_HTTP_PORTS)
|
||||||
@ -1013,6 +1019,9 @@ class httpretty(HttpBaseClass):
|
|||||||
ssl.sslwrap_simple = old_sslwrap_simple
|
ssl.sslwrap_simple = old_sslwrap_simple
|
||||||
ssl.__dict__['sslwrap_simple'] = old_sslwrap_simple
|
ssl.__dict__['sslwrap_simple'] = old_sslwrap_simple
|
||||||
|
|
||||||
|
if pyopenssl_override:
|
||||||
|
inject_into_urllib3()
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def is_enabled(cls):
|
def is_enabled(cls):
|
||||||
return cls._is_enabled
|
return cls._is_enabled
|
||||||
@ -1056,6 +1065,9 @@ class httpretty(HttpBaseClass):
|
|||||||
ssl.sslwrap_simple = fake_wrap_socket
|
ssl.sslwrap_simple = fake_wrap_socket
|
||||||
ssl.__dict__['sslwrap_simple'] = fake_wrap_socket
|
ssl.__dict__['sslwrap_simple'] = fake_wrap_socket
|
||||||
|
|
||||||
|
if pyopenssl_override:
|
||||||
|
extract_from_urllib3()
|
||||||
|
|
||||||
|
|
||||||
def httprettified(test):
|
def httprettified(test):
|
||||||
"A decorator tests that use HTTPretty"
|
"A decorator tests that use HTTPretty"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user