aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/tests/test_packageindex.py
diff options
context:
space:
mode:
Diffstat (limited to 'setuptools/tests/test_packageindex.py')
-rw-r--r--setuptools/tests/test_packageindex.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index dca4c2aa..649e8a4e 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -4,8 +4,14 @@ import sys
import os
import distutils.errors
-import six
-from six.moves import urllib, http_client
+try:
+ from setuptools._vendor import six
+ from setuptools._vendor.six.moves import urllib, http_client
+except ImportError:
+ # fallback to naturally-installed version; allows system packagers to
+ # omit vendored packages.
+ import six
+ from six.moves import urllib, http_client
from .textwrap import DALS
import pkg_resources