upload module is no more

151c018d · Jason R. Coombs · 727779f0 · 151c018d
Commit 151c018d authored Nov 27, 2013 by Jason R. Coombs
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

setuptools/command/upload_docs.py setuptools/command/upload_docs.py +1 -5

No files found.
--- 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