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/tests/test_packageindex.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/tests/test_packageindex.py')
| -rw-r--r-- | setuptools/tests/test_packageindex.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py index 649e8a4e..6a76b5fc 100644 --- a/setuptools/tests/test_packageindex.py +++ b/setuptools/tests/test_packageindex.py @@ -4,14 +4,8 @@ import sys import os import distutils.errors -try: - from setuptools._vendor import six - from setuptools._vendor.six.moves import urllib, http_client -except ImportError: - # fallback to naturally-installed version; allows system packagers to - # omit vendored packages. - import six - from six.moves import urllib, http_client +from setuptools.extern import six +from setuptools.extern.six.moves import urllib, http_client from .textwrap import DALS import pkg_resources |