diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2017-01-23 10:32:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-23 10:32:22 -0500 |
| commit | 089cdeb489a0fa94d11b7307b54210ef9aa40511 (patch) | |
| tree | ee738b703f1b0737e139b5d10f62e54bd20e1028 /setuptools/command/test.py | |
| parent | aaec654d804cb78dbb6391afff721a63f26a71cd (diff) | |
| parent | 11676d39c405672270a543bdc32de395b935b869 (diff) | |
| download | python-setuptools-git-089cdeb489a0fa94d11b7307b54210ef9aa40511.tar.gz | |
Merge pull request #933 from pypa/feature/581-depend-not-bundle
Bundle dependencies instead of vendoring them
Diffstat (limited to 'setuptools/command/test.py')
| -rw-r--r-- | setuptools/command/test.py | 4 |
1 files changed, 2 insertions, 2 deletions
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, |