aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/tests/test_develop.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2015-12-31 16:30:47 -0500
committerJason R. Coombs <jaraco@jaraco.com>2015-12-31 16:30:47 -0500
commit952c1bafda1929c74c737646aa025e6ffad6632e (patch)
tree1fd158d08ce61d8a9f4e2b88d27026e7774f80ff /setuptools/tests/test_develop.py
parent06872bb0bbbeb953e90bd0941444b0d499056557 (diff)
downloadexternal_python_setuptools-952c1bafda1929c74c737646aa025e6ffad6632e.tar.gz
external_python_setuptools-952c1bafda1929c74c737646aa025e6ffad6632e.tar.bz2
external_python_setuptools-952c1bafda1929c74c737646aa025e6ffad6632e.zip
Modeling after Astropy's technique for bundling libraries, the imports are now much cleaner. Thanks @embray. Ref #229.
--HG-- branch : feature/issue-229
Diffstat (limited to 'setuptools/tests/test_develop.py')
-rw-r--r--setuptools/tests/test_develop.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 71aaed6a..1b844499 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -5,12 +5,7 @@ import site
import sys
import io
-try:
- from setuptools._vendor import six
-except ImportError:
- # fallback to naturally-installed version; allows system packagers to
- # omit vendored packages.
- import six
+from setuptools.extern import six
import pytest