summaryrefslogtreecommitdiff
path: root/setuptools/command/test.py
diff options
context:
space:
mode:
Diffstat (limited to 'setuptools/command/test.py')
-rw-r--r--setuptools/command/test.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 5f2e2299..32ff7f15 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -2,7 +2,12 @@ from distutils.errors import DistutilsOptionError
from unittest import TestLoader
import sys
-import six
+try:
+ from setuptools._vendor import six
+except ImportError:
+ # fallback to naturally-installed version; allows system packagers to
+ # omit vendored packages.
+ import six
from pkg_resources import (resource_listdir, resource_exists, normalize_path,
working_set, _namespace_packages,