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/package_index.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/package_index.py')
| -rwxr-xr-x | setuptools/package_index.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/setuptools/package_index.py b/setuptools/package_index.py index 08c36890..ea136c09 100755 --- a/setuptools/package_index.py +++ b/setuptools/package_index.py @@ -14,14 +14,8 @@ try: except ImportError: from urllib2 import splituser -try: - from setuptools._vendor import six - from setuptools._vendor.six.moves import urllib, http_client, configparser -except ImportError: - # fallback to naturally-installed version; allows system packagers to - # omit vendored packages. - import six - from six.moves import urllib, http_client, configparser +from setuptools.extern import six +from setuptools.extern.six.moves import urllib, http_client, configparser from pkg_resources import ( CHECKOUT_DIST, Distribution, BINARY_DIST, normalize_path, SOURCE_DIST, |