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

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

1 files changed, 1 insertions, 6 deletions

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 6e1e5aa4..ec0d5dc2 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,12 +8,7 @@ from distutils.core import Command as _Command
 from distutils.util import convert_path
 from fnmatch import fnmatchcase
 
-try:
-    from setuptools._vendor.six.moves import filterfalse
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    from six.moves import filterfalse
+from setuptools.extern.six.moves import filterfalse
 
 import setuptools.version
 from setuptools.extension import Extension