Strip out vendored packages and require them instead. Ref #581.

40 files changed, 53 insertions, 57 deletions

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 54577ced..c60e1eab 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -7,7 +7,7 @@ import distutils.filelist
 from distutils.util import convert_path
 from fnmatch import fnmatchcase
 
-from setuptools.extern.six.moves import filter, filterfalse, map
+from six.moves import filter, filterfalse, map
 
 import setuptools.version
 from setuptools.extension import Extension
diff --git a/setuptools/command/alias.py b/setuptools/command/alias.py
index 4532b1cc..35ece78d 100755
--- a/setuptools/command/alias.py
+++ b/setuptools/command/alias.py
@@ -1,6 +1,6 @@
 from distutils.errors import DistutilsOptionError
 
-from setuptools.extern.six.moves import map
+from six.moves import map
 
 from setuptools.command.setopt import edit_config, option_base, config_file
 
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 8cd9dfef..ae344cd0 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -11,7 +11,7 @@ import os
 import textwrap
 import marshal
 
-from setuptools.extern import six
+import six
 
 from pkg_resources import get_build_platform, Distribution, ensure_directory
 from pkg_resources import EntryPoint
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 36f53f0d..c2fd8704 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -10,7 +10,7 @@ from distutils.errors import DistutilsError
 from distutils import log
 
 from setuptools.extension import Library
-from setuptools.extern import six
+import six
 
 try:
     # Attempt to use Cython for building extensions, if available
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index b0314fd4..56daa2bd 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -8,8 +8,8 @@ import io
 import distutils.errors
 import itertools
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import map, filter, filterfalse
+import six
+from six.moves import map, filter, filterfalse
 
 try:
     from setuptools.lib2to3_ex import Mixin2to3
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index aa82f959..1489de9e 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -5,7 +5,7 @@ import os
 import glob
 import io
 
-from setuptools.extern import six
+import six
 
 from pkg_resources import Distribution, PathMetadata, normalize_path
 from setuptools.command.easy_install import easy_install
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 36e7f359..d3eabfc3 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -40,8 +40,8 @@ import subprocess
 import shlex
 import io
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import configparser, map
+import six
+from six.moves import configparser, map
 
 from setuptools import Command
 from setuptools.sandbox import run_setup
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 98a87300..2bc57b18 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -16,8 +16,8 @@ import warnings
 import time
 import collections
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import map
+import six
+from six.moves import map
 
 from setuptools import Command
 from setuptools.command.sdist import sdist
@@ -30,7 +30,7 @@ from pkg_resources import (
 import setuptools.unicode_utils as unicode_utils
 from setuptools.glob import glob
 
-from pkg_resources.extern import packaging
+import packaging
 
 
 def translate_pattern(glob):
diff --git a/setuptools/command/py36compat.py b/setuptools/command/py36compat.py
index 61063e75..a2c74b2d 100644
--- a/setuptools/command/py36compat.py
+++ b/setuptools/command/py36compat.py
@@ -3,7 +3,7 @@ from glob import glob
 from distutils.util import convert_path
 from distutils.command import sdist
 
-from setuptools.extern.six.moves import filter
+from six.moves import filter
 
 
 class sdist_add_defaults:
diff --git a/setuptools/command/rotate.py b/setuptools/command/rotate.py
index b89353f5..7ea36e96 100755
--- a/setuptools/command/rotate.py
+++ b/setuptools/command/rotate.py
@@ -4,7 +4,7 @@ from distutils.errors import DistutilsOptionError
 import os
 import shutil
 
-from setuptools.extern import six
+import six
 
 from setuptools import Command
 
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 84e29a1b..2c2d88af 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -5,7 +5,7 @@ import sys
 import io
 import contextlib
 
-from setuptools.extern import six
+import six
 
 from .py36compat import sdist_add_defaults
 
diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py
index 7e57cc02..6f6298c4 100755
--- a/setuptools/command/setopt.py
+++ b/setuptools/command/setopt.py
@@ -4,7 +4,7 @@ from distutils.errors import DistutilsOptionError
 import distutils
 import os
 
-from setuptools.extern.six.moves import configparser
+from six.moves import configparser
 
 from setuptools import Command
 
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index ef0af12f..e7a386d1 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -7,8 +7,8 @@ from distutils.errors import DistutilsError, DistutilsOptionError
 from distutils import log
 from unittest import TestLoader
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import map, filter
+import six
+from six.moves import map, filter
 
 from pkg_resources import (resource_listdir, resource_exists, normalize_path,
                            working_set, _namespace_packages,
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 269dc2d5..eeb0718b 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -16,8 +16,8 @@ import shutil
 import itertools
 import functools
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import http_client, urllib
+import six
+from six.moves import http_client, urllib
 
 from pkg_resources import iter_entry_points
 from .upload import upload
diff --git a/setuptools/config.py b/setuptools/config.py
index d71ff028..19b39629 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -7,7 +7,7 @@ from functools import partial
 
 from distutils.errors import DistutilsOptionError, DistutilsFileError
 from setuptools.py26compat import import_module
-from setuptools.extern.six import string_types
+from six import string_types
 
 
 def read_configuration(
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 159464be..be55dc4e 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -12,9 +12,9 @@ from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
     DistutilsSetupError)
 from distutils.util import rfc822_escape
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import map
-from pkg_resources.extern import packaging
+import six
+from six.moves import map
+import packaging
 
 from setuptools.depends import Require
 from setuptools import windows_support
diff --git a/setuptools/extension.py b/setuptools/extension.py
index 29468894..34a36dfb 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -4,7 +4,7 @@ import distutils.core
 import distutils.errors
 import distutils.extension
 
-from setuptools.extern.six.moves import map
+from six.moves import map
 
 from .monkey import get_unpatched
 
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
deleted file mode 100644
index 2cd08b7e..00000000
--- a/setuptools/extern/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from pkg_resources.extern import VendorImporter
-
-names = 'six',
-VendorImporter(__name__, names, 'pkg_resources._vendor').install()
diff --git a/setuptools/glob.py b/setuptools/glob.py
index 6c781de3..f2644026 100644
--- a/setuptools/glob.py
+++ b/setuptools/glob.py
@@ -10,7 +10,7 @@ Changes include:
 import os
 import re
 import fnmatch
-from setuptools.extern.six import binary_type
+from six import binary_type
 
 __all__ = ["glob", "iglob", "escape"]
 
diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index dbe9a617..5843c46b 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -10,7 +10,7 @@ import functools
 import inspect
 
 from .py26compat import import_module
-from setuptools.extern import six
+import six
 
 import setuptools
 
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 447ddb38..97e27303 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -20,14 +20,14 @@ import sys
 import platform
 import itertools
 import distutils.errors
-from pkg_resources.extern.packaging.version import LegacyVersion
+from packaging.version import LegacyVersion
 
-from setuptools.extern.six.moves import filterfalse
+from six.moves import filterfalse
 
 from .monkey import get_unpatched
 
 if platform.system() == 'Windows':
-    from setuptools.extern.six.moves import winreg
+    from six.moves import winreg
     safe_env = os.environ
 else:
     """
diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index 0a889f22..ba907439 100755
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -3,7 +3,7 @@ import sys
 from distutils import log
 import itertools
 
-from setuptools.extern.six.moves import map
+from six.moves import map
 
 
 flatten = itertools.chain.from_iterable
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index d80d43bc..65c3c433 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -14,8 +14,8 @@ try:
 except ImportError:
     from urllib2 import splituser
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import urllib, http_client, configparser, map
+import six
+from six.moves import urllib, http_client, configparser, map
 
 import setuptools
 from pkg_resources import (
diff --git a/setuptools/py33compat.py b/setuptools/py33compat.py
index 2588d680..ad91d73e 100644
--- a/setuptools/py33compat.py
+++ b/setuptools/py33compat.py
@@ -3,7 +3,7 @@ import code
 import array
 import collections
 
-from setuptools.extern import six
+import six
 
 
 OpArg = collections.namedtuple('OpArg', 'opcode arg')
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 817a3afa..0ddd2332 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -8,8 +8,8 @@ import re
 import contextlib
 import pickle
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import builtins, map
+import six
+from six.moves import builtins, map
 
 import pkg_resources
 
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 82f8870a..efeef71d 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -3,7 +3,7 @@ import socket
 import atexit
 import re
 
-from setuptools.extern.six.moves import urllib, http_client, map
+from six.moves import urllib, http_client, map
 
 import pkg_resources
 from pkg_resources import ResolutionError, ExtractionError
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index dbf16201..f54c478e 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -8,7 +8,7 @@ from distutils.errors import DistutilsSetupError
 from distutils.core import Extension
 from distutils.version import LooseVersion
 
-from setuptools.extern import six
+import six
 import pytest
 
 import setuptools.dist
diff --git a/setuptools/tests/contexts.py b/setuptools/tests/contexts.py
index 535ae107..77ebecf9 100644
--- a/setuptools/tests/contexts.py
+++ b/setuptools/tests/contexts.py
@@ -5,7 +5,7 @@ import sys
 import contextlib
 import site
 
-from setuptools.extern import six
+import six
 import pkg_resources
 
 
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index 35312120..5cdde217 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -4,7 +4,7 @@
 import time
 import threading
 
-from setuptools.extern.six.moves import BaseHTTPServer, SimpleHTTPServer
+from six.moves import BaseHTTPServer, SimpleHTTPServer
 
 
 class IndexServer(BaseHTTPServer.HTTPServer):
diff --git a/setuptools/tests/test_archive_util.py b/setuptools/tests/test_archive_util.py
index b789e9ac..5cdf63f2 100644
--- a/setuptools/tests/test_archive_util.py
+++ b/setuptools/tests/test_archive_util.py
@@ -3,7 +3,7 @@
 import tarfile
 import io
 
-from setuptools.extern import six
+import six
 
 import pytest
 
diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index 60257154..59a896d8 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -2,7 +2,7 @@ import sys
 import distutils.command.build_ext as orig
 from distutils.sysconfig import get_config_var
 
-from setuptools.extern import six
+import six
 
 from setuptools.command.build_ext import build_ext, get_abi3_suffix
 from setuptools.dist import Distribution
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 5dd72aae..3b1b1e2d 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -9,7 +9,7 @@ import sys
 import io
 import subprocess
 
-from setuptools.extern import six
+import six
 from setuptools.command import test
 
 import pytest
diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index f7e7d2bf..24c5149a 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 
-from setuptools.extern.six.moves import map
+from six.moves import map
 
 import pytest
 
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 1ea33b08..f5c932da 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -16,7 +16,7 @@ import io
 import zipfile
 
 import time
-from setuptools.extern.six.moves import urllib
+from six.moves import urllib
 
 import pytest
 try:
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index a32b981d..c9a4425a 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -6,7 +6,7 @@ import sys
 
 from setuptools.command.egg_info import egg_info, manifest_maker
 from setuptools.dist import Distribution
-from setuptools.extern.six.moves import map
+from six.moves import map
 
 import pytest
 
diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 78fb0627..a83d4fe8 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -7,7 +7,7 @@ import glob
 import os
 import sys
 
-from setuptools.extern.six.moves import urllib
+from six.moves import urllib
 import pytest
 
 from setuptools.command.easy_install import easy_install
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index 602c43a2..cf39346a 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -11,7 +11,7 @@ from distutils.errors import DistutilsTemplateError
 
 from setuptools.command.egg_info import FileList, egg_info, translate_pattern
 from setuptools.dist import Distribution
-from setuptools.extern import six
+import six
 from setuptools.tests.textwrap import DALS
 
 import pytest
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index f09dd78c..d68867c2 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -4,8 +4,8 @@ import sys
 import os
 import distutils.errors
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import urllib, http_client
+import six
+from six.moves import urllib, http_client
 
 import pkg_resources
 import setuptools.package_index
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index f34068dc..38fdda24 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -9,8 +9,8 @@ import unicodedata
 import contextlib
 import io
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import map
+import six
+from six.moves import map
 
 import pytest
 
diff --git a/setuptools/unicode_utils.py b/setuptools/unicode_utils.py
index 7c63efd2..6a84f9be 100644
--- a/setuptools/unicode_utils.py
+++ b/setuptools/unicode_utils.py
@@ -1,7 +1,7 @@
 import unicodedata
 import sys
 
-from setuptools.extern import six
+import six
 
 
 # HFS Plus uses decomposed UTF-8