diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-12-31 11:51:01 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-12-31 11:51:01 -0500 |
| commit | 06872bb0bbbeb953e90bd0941444b0d499056557 (patch) | |
| tree | 73adc719c4acd99095181f0ccd42bbc7564ef8f0 /setuptools/package_index.py | |
| parent | 29fa01621c3de0a5c78c4f49b5d051386d0d566f (diff) | |
| download | external_python_setuptools-06872bb0bbbeb953e90bd0941444b0d499056557.tar.gz external_python_setuptools-06872bb0bbbeb953e90bd0941444b0d499056557.tar.bz2 external_python_setuptools-06872bb0bbbeb953e90bd0941444b0d499056557.zip | |
Update vendoring technique to match that used for packaging. 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, 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, |