diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2014-07-05 15:06:51 -0400 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-07-05 15:06:51 -0400 |
commit | b49435397a5094f94678adf3549cc8941aa469b7 (patch) | |
tree | b123bdd63482393ba1e2859364920f40a3d9f71d /setuptools/ssl_support.py | |
parent | 5b865b1b6e23379d23aa80e74adb38db8b14b6ca (diff) | |
download | external_python_setuptools-b49435397a5094f94678adf3549cc8941aa469b7.tar.gz external_python_setuptools-b49435397a5094f94678adf3549cc8941aa469b7.tar.bz2 external_python_setuptools-b49435397a5094f94678adf3549cc8941aa469b7.zip |
Use six for Python 2 compatibility
--HG--
branch : feature/issue-229
extra : source : 7b1997ececc5772798ce33a0f8e77387cb55a977
Diffstat (limited to 'setuptools/ssl_support.py')
-rw-r--r-- | setuptools/ssl_support.py | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py index 7b5f429f..b574f4b9 100644 --- a/setuptools/ssl_support.py +++ b/setuptools/ssl_support.py @@ -3,9 +3,10 @@ import socket import atexit import re +from 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) @@ -191,7 +186,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 |