diff options
Diffstat (limited to 'setuptools/dist.py')
| -rw-r--r-- | setuptools/dist.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py index 7335c967..11b42d19 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -13,7 +13,12 @@ from distutils.core import Distribution as _Distribution from distutils.errors import (DistutilsOptionError, DistutilsPlatformError, DistutilsSetupError) -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 setuptools.depends import Require from setuptools import windows_support |