summaryrefslogtreecommitdiff
path: root/setuptools/command/upload_docs.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-11-27 13:31:11 -0500
committerJason R. Coombs <jaraco@jaraco.com>2013-11-27 13:31:11 -0500
commitcb73e77ca3e7de0487d29d8dc4336d0a627a6b9b (patch)
tree37249774986cbc998b5bd487f87be1cab4f05548 /setuptools/command/upload_docs.py
parent9de671b90e9dd033fe0c21ef2e9d83ea3cf58537 (diff)
downloadpython-setuptools-bitbucket-cb73e77ca3e7de0487d29d8dc4336d0a627a6b9b.tar.gz
upload module is no more
Diffstat (limited to 'setuptools/command/upload_docs.py')
-rw-r--r--setuptools/command/upload_docs.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 12bc916b..4ad3433e 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -17,11 +17,7 @@ from pkg_resources import iter_entry_points
from distutils import log
from distutils.errors import DistutilsOptionError
-
-try:
- from distutils.command.upload import upload
-except ImportError:
- from setuptools.command.upload import upload
+from distutils.command.upload import upload
from setuptools.compat import httplib, urlparse, unicode, iteritems