13 files changed, 19 insertions, 19 deletions
diff --git a/setuptools/command/alias.py b/setuptools/command/alias.py
index 35ece78d..4532b1cc 100755
--- a/setuptools/command/alias.py
+++ b/setuptools/command/alias.py
@@ -1,6 +1,6 @@
 from distutils.errors import DistutilsOptionError
 
-from six.moves import map
+from setuptools.extern.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 ae344cd0..8cd9dfef 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -11,7 +11,7 @@ import os
 import textwrap
 import marshal
 
-import six
+from setuptools.extern 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 c2fd8704..36f53f0d 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
-import six
+from setuptools.extern 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 56daa2bd..b0314fd4 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -8,8 +8,8 @@ import io
 import distutils.errors
 import itertools
 
-import six
-from six.moves import map, filter, filterfalse
+from setuptools.extern import six
+from setuptools.extern.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 ddfdc662..85b23c60 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -5,7 +5,7 @@ import os
 import glob
 import io
 
-import six
+from setuptools.extern 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 d3eabfc3..36e7f359 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -40,8 +40,8 @@ import subprocess
 import shlex
 import io
 
-import six
-from six.moves import configparser, map
+from setuptools.extern import six
+from setuptools.extern.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 1a6ea9cb..a32c42f8 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -16,8 +16,8 @@ import warnings
 import time
 import collections
 
-import six
-from six.moves import map
+from setuptools.extern import six
+from setuptools.extern.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
 
-import packaging
+from pkg_resources.extern import packaging
 
 
 def translate_pattern(glob):
diff --git a/setuptools/command/py36compat.py b/setuptools/command/py36compat.py
index a2c74b2d..61063e75 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 six.moves import filter
+from setuptools.extern.six.moves import filter
 
 
 class sdist_add_defaults:
diff --git a/setuptools/command/rotate.py b/setuptools/command/rotate.py
index 7ea36e96..b89353f5 100755
--- a/setuptools/command/rotate.py
+++ b/setuptools/command/rotate.py
@@ -4,7 +4,7 @@ from distutils.errors import DistutilsOptionError
 import os
 import shutil
 
-import six
+from setuptools.extern import six
 
 from setuptools import Command
 
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 2c2d88af..84e29a1b 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -5,7 +5,7 @@ import sys
 import io
 import contextlib
 
-import six
+from setuptools.extern import six
 
 from .py36compat import sdist_add_defaults
 
diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py
index 6f6298c4..7e57cc02 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 six.moves import configparser
+from setuptools.extern.six.moves import configparser
 
 from setuptools import Command
 
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index e7a386d1..ef0af12f 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
 
-import six
-from six.moves import map, filter
+from setuptools.extern import six
+from setuptools.extern.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 eeb0718b..269dc2d5 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -16,8 +16,8 @@ import shutil
 import itertools
 import functools
 
-import six
-from six.moves import http_client, urllib
+from setuptools.extern import six
+from setuptools.extern.six.moves import http_client, urllib
 
 from pkg_resources import iter_entry_points
 from .upload import upload