From 1b595f26d867e6ee292f319ff93a2d8bf8ce3f0f Mon Sep 17 00:00:00 2001 From: Erica Portnoy Date: Fri, 2 Nov 2018 13:31:48 -0700 Subject: [PATCH] Requests no longer vendorizes urllib3 --- acme/acme/client.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/acme/acme/client.py b/acme/acme/client.py index bd86657b9..7a8a15219 100644 --- a/acme/acme/client.py +++ b/acme/acme/client.py @@ -32,11 +32,8 @@ 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 - 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() + import urllib3.contrib.pyopenssl # pylint: disable=import-error + urllib3.contrib.pyopenssl.inject_into_urllib3() DEFAULT_NETWORK_TIMEOUT = 45