From 151c018dbea53c09c07f0483ffb05118cb6c51f4 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Wed, 27 Nov 2013 13:31:11 -0500 Subject: upload module is no more --- setuptools/command/upload_docs.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'setuptools/command') 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 -- cgit v1.2.3