From 952c1bafda1929c74c737646aa025e6ffad6632e Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 31 Dec 2015 16:30:47 -0500 Subject: Modeling after Astropy's technique for bundling libraries, the imports are now much cleaner. Thanks @embray. Ref #229. --HG-- branch : feature/issue-229 --- setuptools/package_index.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'setuptools/package_index.py') 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, -- cgit v1.2.1