From 3edb36c4cca925fec02c6133e9af7ee0dde324ae Mon Sep 17 00:00:00 2001 From: Erica Portnoy Date: Thu, 22 Nov 2018 03:43:25 +0000 Subject: [PATCH] Revert acme/acme/client.py --- acme/acme/client.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/acme/acme/client.py b/acme/acme/client.py index 54ae58764..adc8ad9e3 100644 --- a/acme/acme/client.py +++ b/acme/acme/client.py @@ -32,8 +32,11 @@ logger = logging.getLogger(__name__) # for SSL, which does allow these options to be configured. # https://urllib3.readthedocs.org/en/latest/security.html#insecureplatformwarning if sys.version_info < (2, 7, 9): # pragma: no cover - import urllib3.contrib.pyopenssl # pylint: disable=import-error - urllib3.contrib.pyopenssl.inject_into_urllib3() + try: + requests.packages.urllib3.contrib.pyopenssl.inject_into_urllib3() # type: ignore + except AttributeError: + import urllib3.contrib.pyopenssl # pylint: disable=import-error + urllib3.contrib.pyopenssl.inject_into_urllib3() DEFAULT_NETWORK_TIMEOUT = 45