summaryrefslogtreecommitdiff
path: root/setuptools/tests/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'setuptools/tests/__init__.py')
-rw-r--r--setuptools/tests/__init__.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index b2c6894f..0a625993 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -8,7 +8,12 @@ from distutils.errors import DistutilsSetupError
from distutils.core import Extension
from distutils.version import LooseVersion
-import six
+try:
+ from setuptools._vendor import six
+except ImportError:
+ # fallback to naturally-installed version; allows system packagers to
+ # omit vendored packages.
+ import six
import pytest
import setuptools.dist