summaryrefslogtreecommitdiff
path: root/setuptools/command/upload_docs.py
diff options
context:
space:
mode:
Diffstat (limited to 'setuptools/command/upload_docs.py')
-rw-r--r--setuptools/command/upload_docs.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 43b5d76a..60e9fb7e 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -16,8 +16,14 @@ import tempfile
import sys
import shutil
-from six.moves import http_client, urllib
-import six
+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 pkg_resources import iter_entry_points