aboutsummaryrefslogtreecommitdiffstats
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
commit151c018dbea53c09c07f0483ffb05118cb6c51f4 (patch)
tree30a8daf47b752429c92d34d8df6e0f054f84e7a6 /setuptools/command/upload_docs.py
parent727779f0ec69dea4624c684b551192f59211f697 (diff)
downloadexternal_python_setuptools-151c018dbea53c09c07f0483ffb05118cb6c51f4.tar.gz
external_python_setuptools-151c018dbea53c09c07f0483ffb05118cb6c51f4.tar.bz2
external_python_setuptools-151c018dbea53c09c07f0483ffb05118cb6c51f4.zip
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