aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/tests/__init__.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2017-01-01 22:34:28 -0500
committerJason R. Coombs <jaraco@jaraco.com>2017-01-01 22:34:39 -0500
commitff371f18f0076bc63da05334f7e551c1cc29e10d (patch)
treed8e4212c8d53325fb149117c93233727d36b5ce8 /setuptools/tests/__init__.py
parent4c2dc87f5c63333a6f83be217c86f387f9ecd02a (diff)
downloadexternal_python_setuptools-ff371f18f0076bc63da05334f7e551c1cc29e10d.tar.gz
external_python_setuptools-ff371f18f0076bc63da05334f7e551c1cc29e10d.tar.bz2
external_python_setuptools-ff371f18f0076bc63da05334f7e551c1cc29e10d.zip
Strip out vendored packages and require them instead. Ref #581.
Diffstat (limited to 'setuptools/tests/__init__.py')
-rw-r--r--setuptools/tests/__init__.py2
1 files changed, 1 insertions, 1 deletions
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