summaryrefslogtreecommitdiff
path: root/setuptools/command/upload_docs.py
diff options
context:
space:
mode:
authorTarek Ziade <tarek@ziade.org>2010-05-06 18:10:32 +0200
committerTarek Ziade <tarek@ziade.org>2010-05-06 18:10:32 +0200
commit4ce79bab42635254a55104ffc65ec34879345eb0 (patch)
tree78d6224e4d9a7a1cdaa487f27ef14859e4038006 /setuptools/command/upload_docs.py
parentd1ebb7ff08df107ae81e6a6c8a85db9e5d7aebd2 (diff)
downloadpython-setuptools-bitbucket-4ce79bab42635254a55104ffc65ec34879345eb0.tar.gz
make sure all tests passes on all python versions fixes #149
Diffstat (limited to 'setuptools/command/upload_docs.py')
-rw-r--r--setuptools/command/upload_docs.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index ea2bad7e..213f7b58 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -16,7 +16,11 @@ import sys
from distutils import log
from distutils.errors import DistutilsOptionError
-from distutils.command.upload import upload
+
+try:
+ from distutils.command.upload import upload
+except ImportError:
+ from setuptools.command.upload import upload
_IS_PYTHON3 = sys.version > '3'