summaryrefslogtreecommitdiff
path: root/setuptools/command/upload_docs.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2017-01-23 10:32:22 -0500
committerGitHub <noreply@github.com>2017-01-23 10:32:22 -0500
commit089cdeb489a0fa94d11b7307b54210ef9aa40511 (patch)
treeee738b703f1b0737e139b5d10f62e54bd20e1028 /setuptools/command/upload_docs.py
parentaaec654d804cb78dbb6391afff721a63f26a71cd (diff)
parent11676d39c405672270a543bdc32de395b935b869 (diff)
downloadpython-setuptools-git-089cdeb489a0fa94d11b7307b54210ef9aa40511.tar.gz
Merge pull request #933 from pypa/feature/581-depend-not-bundle
Bundle dependencies instead of vendoring them
Diffstat (limited to 'setuptools/command/upload_docs.py')
-rw-r--r--setuptools/command/upload_docs.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 269dc2d5..eeb0718b 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -16,8 +16,8 @@ import shutil
import itertools
import functools
-from setuptools.extern import six
-from setuptools.extern.six.moves import http_client, urllib
+import six
+from six.moves import http_client, urllib
from pkg_resources import iter_entry_points
from .upload import upload