From 503afebd54653de30c92162008dc26c160a79e2b Mon Sep 17 00:00:00 2001 From: Harlan Lieberman-Berg Date: Sat, 5 Sep 2015 22:47:25 -0400 Subject: [PATCH 1/2] Make urllib3 injection more version specific. --- acme/acme/client.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/acme/acme/client.py b/acme/acme/client.py index 690630876..cbf424f92 100644 --- a/acme/acme/client.py +++ b/acme/acme/client.py @@ -8,7 +8,7 @@ from six.moves import http_client # pylint: disable=import-error import OpenSSL import requests -import six +import sys import werkzeug from acme import errors @@ -19,8 +19,8 @@ from acme import messages logger = logging.getLogger(__name__) -# https://urllib3.readthedocs.org/en/latest/security.html#insecureplatformwarning -if six.PY2: +# Python does not validate certificates by default before version 2.7.9 +if sys.version_info < (2, 7, 9): requests.packages.urllib3.contrib.pyopenssl.inject_into_urllib3() From 10460eb285735bcf217d8ecfbf2336521ab88725 Mon Sep 17 00:00:00 2001 From: Harlan Lieberman-Berg Date: Sun, 6 Sep 2015 13:46:48 -0400 Subject: [PATCH 2/2] Add no cover pragma, URL for documentation. --- acme/acme/client.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/acme/acme/client.py b/acme/acme/client.py index cbf424f92..61c0cb34c 100644 --- a/acme/acme/client.py +++ b/acme/acme/client.py @@ -20,7 +20,8 @@ from acme import messages logger = logging.getLogger(__name__) # Python does not validate certificates by default before version 2.7.9 -if sys.version_info < (2, 7, 9): +# https://urllib3.readthedocs.org/en/latest/security.html#insecureplatformwarning +if sys.version_info < (2, 7, 9): # pragma: no cover requests.packages.urllib3.contrib.pyopenssl.inject_into_urllib3()