From 3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 24 Feb 2017 11:49:51 -0500 Subject: Revert "Merge pull request #933 from pypa/feature/581-depend-not-bundle" This reverts commit 089cdeb489a0fa94d11b7307b54210ef9aa40511, reversing changes made to aaec654d804cb78dbb6391afff721a63f26a71cd. --- setuptools/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setuptools/config.py') diff --git a/setuptools/config.py b/setuptools/config.py index 39a01f88..0149316c 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 six import string_types +from setuptools.extern.six import string_types def read_configuration( -- cgit v1.2.3