diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-12-31 16:30:47 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-12-31 16:30:47 -0500 |
| commit | 952c1bafda1929c74c737646aa025e6ffad6632e (patch) | |
| tree | 1fd158d08ce61d8a9f4e2b88d27026e7774f80ff /setuptools/ssl_support.py | |
| parent | 06872bb0bbbeb953e90bd0941444b0d499056557 (diff) | |
| download | external_python_setuptools-952c1bafda1929c74c737646aa025e6ffad6632e.tar.gz external_python_setuptools-952c1bafda1929c74c737646aa025e6ffad6632e.tar.bz2 external_python_setuptools-952c1bafda1929c74c737646aa025e6ffad6632e.zip | |
Modeling after Astropy's technique for bundling libraries, the imports are now much cleaner. Thanks @embray. Ref #229.
--HG--
branch : feature/issue-229
Diffstat (limited to 'setuptools/ssl_support.py')
| -rw-r--r-- | setuptools/ssl_support.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py index 327c2fcb..7baedd19 100644 --- a/setuptools/ssl_support.py +++ b/setuptools/ssl_support.py @@ -3,12 +3,7 @@ import socket import atexit import re -try: - from setuptools._vendor.six.moves import urllib, http_client -except ImportError: - # fallback to naturally-installed version; allows system packagers to - # omit vendored packages. - from six.moves import urllib, http_client +from setuptools.extern.six.moves import urllib, http_client import pkg_resources from pkg_resources import ResolutionError, ExtractionError |