diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-12-31 16:30:47 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-12-31 16:30:47 -0500 |
| commit | 952c1bafda1929c74c737646aa025e6ffad6632e (patch) | |
| tree | 1fd158d08ce61d8a9f4e2b88d27026e7774f80ff /setuptools/depends.py | |
| parent | 06872bb0bbbeb953e90bd0941444b0d499056557 (diff) | |
| download | python-setuptools-git-952c1bafda1929c74c737646aa025e6ffad6632e.tar.gz | |
Modeling after Astropy's technique for bundling libraries, the imports are now much cleaner. Thanks @embray. Ref #229.
--HG--
branch : feature/issue-229
Diffstat (limited to 'setuptools/depends.py')
| -rw-r--r-- | setuptools/depends.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/setuptools/depends.py b/setuptools/depends.py index e633c05b..9f7c9a35 100644 --- a/setuptools/depends.py +++ b/setuptools/depends.py @@ -4,12 +4,7 @@ import marshal from imp import PKG_DIRECTORY, PY_COMPILED, PY_SOURCE, PY_FROZEN from distutils.version import StrictVersion -try: - from setuptools._vendor import six -except ImportError: - # fallback to naturally-installed version; allows system packagers to - # omit vendored packages. - import six +from setuptools.extern import six __all__ = [ 'Require', 'find_module', 'get_module_constant', 'extract_constant' |