diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-12-31 11:51:01 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-12-31 11:51:01 -0500 |
| commit | 9fed012172521fb5cd8edb75e088fb20ea293387 (patch) | |
| tree | 8e9969cfdc8567d1fe80066d1c8e9d28f2978255 /setuptools/command/develop.py | |
| parent | 2a73c2660c1cd127d93c5c5d75d06a3afca2c39d (diff) | |
| download | python-setuptools-bitbucket-9fed012172521fb5cd8edb75e088fb20ea293387.tar.gz | |
Update vendoring technique to match that used for packaging. Ref #229.
Diffstat (limited to 'setuptools/command/develop.py')
| -rwxr-xr-x | setuptools/command/develop.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py index ef9ac22d..c401c8d4 100755 --- a/setuptools/command/develop.py +++ b/setuptools/command/develop.py @@ -5,7 +5,12 @@ import os import glob import io -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 Distribution, PathMetadata, normalize_path from setuptools.command.easy_install import easy_install |