Modeling after Astropy's technique for bundling libraries, the imports are now much cleaner. Thanks @embray. Ref #229.

--HG--
branch : feature/issue-229

8 files changed, 10 insertions, 54 deletions

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 0a625993..32447356 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -8,12 +8,7 @@ from distutils.errors import DistutilsSetupError
 from distutils.core import Extension
 from distutils.version import LooseVersion
 
-try:
-    from setuptools._vendor import six
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
+from setuptools.extern import six
 import pytest
 
 import setuptools.dist
diff --git a/setuptools/tests/contexts.py b/setuptools/tests/contexts.py
index 3a0ce6b5..8c9a2d3e 100644
--- a/setuptools/tests/contexts.py
+++ b/setuptools/tests/contexts.py
@@ -5,12 +5,7 @@ import sys
 import contextlib
 import site
 
-try:
-    from setuptools._vendor import six
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
+from setuptools.extern import six
 
 
 @contextlib.contextmanager
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index ef5c8f62..6a687937 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -4,12 +4,7 @@
 import time
 import threading
 
-try:
-    from setuptools._vendor.six.moves import BaseHTTPServer, SimpleHTTPServer
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    from six.moves import BaseHTTPServer, SimpleHTTPServer
+from setuptools.extern.six.moves import BaseHTTPServer, SimpleHTTPServer
 
 
 class IndexServer(BaseHTTPServer.HTTPServer):
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 71aaed6a..1b844499 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -5,12 +5,7 @@ import site
 import sys
 import io
 
-try:
-    from setuptools._vendor import six
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
+from setuptools.extern import six
 
 import pytest
 
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index de34ca27..94e317b3 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -16,14 +16,8 @@ import itertools
 import distutils.errors
 import io
 
-try:
-    from setuptools._vendor import six
-    from setuptools._vendor.six.moves import urllib
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
-    from six.moves import urllib
+from setuptools.extern import six
+from setuptools.extern.six.moves import urllib
 
 import pytest
 try:
diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 1c574020..04772ba5 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -7,14 +7,7 @@ import glob
 import os
 import sys
 
-try:
-    from setuptools._vendor.six.moves import urllib
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    from six.moves import urllib
-
-
+from setuptools.extern.six.moves import urllib
 import pytest
 
 from setuptools.command.easy_install import easy_install
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
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index ea176733..753b507d 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -9,12 +9,7 @@ import unicodedata
 import contextlib
 import io
 
-try:
-    from setuptools._vendor import six
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
+from setuptools.extern import six
 
 import pytest