aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/command/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'setuptools/command/__init__.py')
-rw-r--r--setuptools/command/__init__.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py
index 678f4e61..0689b788 100644
--- a/setuptools/command/__init__.py
+++ b/setuptools/command/__init__.py
@@ -5,6 +5,10 @@ __all__ = [
'register',
]
+import sys
+if sys.version>='2.5':
+ # In Python 2.5 and above, distutils includes its own upload command
+ __all__.remove('upload')
from distutils.command.bdist import bdist
@@ -12,4 +16,4 @@ if 'egg' not in bdist.format_commands:
bdist.format_command['egg'] = ('bdist_egg', "Python .egg file")
bdist.format_commands.append('egg')
-del bdist
+del bdist, sys