diff options
Diffstat (limited to 'setuptools/package_index.py')
| -rwxr-xr-x | setuptools/package_index.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/setuptools/package_index.py b/setuptools/package_index.py index 657b467f..08c36890 100755 --- a/setuptools/package_index.py +++ b/setuptools/package_index.py @@ -14,8 +14,14 @@ try: except ImportError: from urllib2 import splituser -import six -from six.moves import urllib, http_client, configparser +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 pkg_resources import ( CHECKOUT_DIST, Distribution, BINARY_DIST, normalize_path, SOURCE_DIST, |