Revert "Merge pull request #933 from pypa/feature/581-depend-not-bundle"

This reverts commit 089cdeb489a0fa94d11b7307b54210ef9aa40511, reversing
changes made to aaec654d804cb78dbb6391afff721a63f26a71cd.

13 files changed, 15 insertions, 15 deletions

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index f54c478e..dbf16201 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
 
-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 77ebecf9..535ae107 100644
--- a/setuptools/tests/contexts.py
+++ b/setuptools/tests/contexts.py
@@ -5,7 +5,7 @@ import sys
 import contextlib
 import site
 
-import six
+from setuptools.extern import six
 import pkg_resources
 
 
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index 5cdde217..35312120 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -4,7 +4,7 @@
 import time
 import threading
 
-from six.moves import BaseHTTPServer, SimpleHTTPServer
+from setuptools.extern.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 5cdf63f2..b789e9ac 100644
--- a/setuptools/tests/test_archive_util.py
+++ b/setuptools/tests/test_archive_util.py
@@ -3,7 +3,7 @@
 import tarfile
 import io
 
-import six
+from setuptools.extern import six
 
 import pytest
 
diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index 59a896d8..60257154 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
 
-import six
+from setuptools.extern 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 54e199c3..ad7cfa05 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -9,7 +9,7 @@ import sys
 import io
 import subprocess
 
-import six
+from setuptools.extern 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 24c5149a..f7e7d2bf 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 six.moves import map
+from setuptools.extern.six.moves import map
 
 import pytest
 
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index b75e6ff2..52db16f6 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -17,7 +17,7 @@ import zipfile
 from unittest import mock
 
 import time
-from six.moves import urllib
+from setuptools.extern.six.moves import urllib
 
 import pytest
 
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index c9a4425a..a32b981d 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 six.moves import map
+from setuptools.extern.six.moves import map
 
 import pytest
 
diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index a83d4fe8..78fb0627 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -7,7 +7,7 @@ import glob
 import os
 import sys
 
-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_manifest.py b/setuptools/tests/test_manifest.py
index 3b34c888..f17cf6a6 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
-import six
+from setuptools.extern 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 1a66394f..53e20d44 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -4,8 +4,8 @@ import sys
 import os
 import distutils.errors
 
-import six
-from six.moves import urllib, http_client
+from setuptools.extern import six
+from setuptools.extern.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 38fdda24..f34068dc 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -9,8 +9,8 @@ import unicodedata
 import contextlib
 import io
 
-import six
-from six.moves import map
+from setuptools.extern import six
+from setuptools.extern.six.moves import map
 
 import pytest