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__.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py
index a601e2d3..b063fa19 100644
--- a/setuptools/command/__init__.py
+++ b/setuptools/command/__init__.py
@@ -8,6 +8,10 @@ __all__ = [
from setuptools.command import install_scripts
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
if 'egg' not in bdist.format_commands: