diff options
| author | Guy Rozendorn (guyr@infinidat.com) <Guy Rozendorn (guyr@infinidat.com)> | 2011-10-07 19:08:55 +0200 |
|---|---|---|
| committer | Guy Rozendorn (guyr@infinidat.com) <Guy Rozendorn (guyr@infinidat.com)> | 2011-10-07 19:08:55 +0200 |
| commit | d5df4531433b2031186ed2a8b335892b3600912b (patch) | |
| tree | c27853520f4f6aff409c1602d88199ea822cdd94 /setuptools/command/__init__.py | |
| parent | 257f23372a797ede9e14ae3e62c8319896943857 (diff) | |
| download | external_python_setuptools-d5df4531433b2031186ed2a8b335892b3600912b.tar.gz external_python_setuptools-d5df4531433b2031186ed2a8b335892b3600912b.tar.bz2 external_python_setuptools-d5df4531433b2031186ed2a8b335892b3600912b.zip | |
Reverting 1a1ab844f03e due to issue 250
--HG--
branch : distribute
extra : rebase_source : 0dca5e604c96429f07c4d7786d3a0991c42c129d
Diffstat (limited to 'setuptools/command/__init__.py')
| -rw-r--r-- | setuptools/command/__init__.py | 4 |
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: |