aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/ssl_support.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-01-04 21:00:47 -0500
committerJason R. Coombs <jaraco@jaraco.com>2016-01-04 21:00:47 -0500
commitd9184f7b8f0b9405f68ea45dbd574aad6a08666d (patch)
treee93b4d6ca527f8b22c4a11b978864f61ebe02405 /setuptools/ssl_support.py
parent6bdbe8957d8c8d293e3fea3fa4baf45eb7c3a3a4 (diff)
parentb639cf0fa905f6fda3879c991197b759aaa20091 (diff)
downloadexternal_python_setuptools-d9184f7b8f0b9405f68ea45dbd574aad6a08666d.tar.gz
external_python_setuptools-d9184f7b8f0b9405f68ea45dbd574aad6a08666d.tar.bz2
external_python_setuptools-d9184f7b8f0b9405f68ea45dbd574aad6a08666d.zip
Merge feature/issue-22919.3b1
Diffstat (limited to 'setuptools/ssl_support.py')
-rw-r--r--setuptools/ssl_support.py21
1 files changed, 8 insertions, 13 deletions
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 7394f4f5..7baedd19 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -3,9 +3,10 @@ import socket
import atexit
import re
+from setuptools.extern.six.moves import urllib, http_client
+
import pkg_resources
from pkg_resources import ResolutionError, ExtractionError
-from setuptools.compat import urllib2
try:
import ssl
@@ -27,17 +28,11 @@ cert_paths = """
""".strip().split()
-HTTPSHandler = HTTPSConnection = object
-
-for what, where in (
- ('HTTPSHandler', ['urllib2','urllib.request']),
- ('HTTPSConnection', ['httplib', 'http.client']),
-):
- for module in where:
- try:
- exec("from %s import %s" % (module, what))
- except ImportError:
- pass
+try:
+ HTTPSHandler = urllib.request.HTTPSHandler
+ HTTPSConnection = http_client.HTTPSConnection
+except AttributeError:
+ HTTPSHandler = HTTPSConnection = object
is_available = ssl is not None and object not in (HTTPSHandler, HTTPSConnection)
@@ -198,7 +193,7 @@ class VerifyingHTTPSConn(HTTPSConnection):
def opener_for(ca_bundle=None):
"""Get a urlopen() replacement that uses ca_bundle for verification"""
- return urllib2.build_opener(
+ return urllib.request.build_opener(
VerifyingHTTPSHandler(ca_bundle or find_ca_bundle())
).open