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/command/upload_docs.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/command/upload_docs.py')
| -rw-r--r-- | setuptools/command/upload_docs.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py index 60e9fb7e..ca35a3ce 100644 --- a/setuptools/command/upload_docs.py +++ b/setuptools/command/upload_docs.py @@ -16,14 +16,8 @@ import tempfile import sys import shutil -try: - from setuptools._vendor import six - from setuptools._vendor.six.moves import http_client, urllib -except ImportError: - # fallback to naturally-installed version; allows system packagers to - # omit vendored packages. - import six - from six.moves import http_client, urllib +from setuptools.extern import six +from setuptools.extern.six.moves import http_client, urllib from pkg_resources import iter_entry_points |