From 06872bb0bbbeb953e90bd0941444b0d499056557 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 31 Dec 2015 11:51:01 -0500 Subject: Update vendoring technique to match that used for packaging. Ref #229. --HG-- branch : feature/issue-229 --- setuptools/package_index.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'setuptools/package_index.py') 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, -- cgit v1.2.1