diff options
| author | Tarek Ziade <tarek@ziade.org> | 2010-05-06 18:10:32 +0200 |
|---|---|---|
| committer | Tarek Ziade <tarek@ziade.org> | 2010-05-06 18:10:32 +0200 |
| commit | 6a6a261fa50522d77fba6d6345fb71ba9f00c311 (patch) | |
| tree | 4d025291624e9ce33cfed1400b13907d8384d145 /setuptools/command/upload_docs.py | |
| parent | 3cd5038930832fce95fb41d20150e173eb9894b5 (diff) | |
| download | external_python_setuptools-6a6a261fa50522d77fba6d6345fb71ba9f00c311.tar.gz external_python_setuptools-6a6a261fa50522d77fba6d6345fb71ba9f00c311.tar.bz2 external_python_setuptools-6a6a261fa50522d77fba6d6345fb71ba9f00c311.zip | |
make sure all tests passes on all python versions fixes #149
--HG--
branch : distribute
extra : rebase_source : 6288f4fcf65083b9d4ffb0ea8b35af44e699b4d5
Diffstat (limited to 'setuptools/command/upload_docs.py')
| -rw-r--r-- | setuptools/command/upload_docs.py | 6 |
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' |