diff options
| author | PJ Eby <distutils-sig@python.org> | 2006-09-20 20:48:18 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2006-09-20 20:48:18 +0000 |
| commit | 3bf8c4fa854d9cbb9af700b3852b1fded03fea54 (patch) | |
| tree | fd0144208164ea3b3e570e076d9be6ff3bf687ea /setuptools/command | |
| parent | 7e0489e508d6f3edeb525c05f1c84f19b94361a6 (diff) | |
| download | external_python_setuptools-3bf8c4fa854d9cbb9af700b3852b1fded03fea54.tar.gz external_python_setuptools-3bf8c4fa854d9cbb9af700b3852b1fded03fea54.tar.bz2 external_python_setuptools-3bf8c4fa854d9cbb9af700b3852b1fded03fea54.zip | |
Backport all known 2.5-compatibility fixes
--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4051935
Diffstat (limited to 'setuptools/command')
| -rw-r--r-- | setuptools/command/__init__.py | 6 | ||||
| -rwxr-xr-x | setuptools/command/easy_install.py | 2 |
2 files changed, 6 insertions, 2 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 diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 0514adb1..288ca1de 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -1588,6 +1588,7 @@ usage: %(script)s [options] requirement_or_url ... with_ei_usage(lambda: setup( script_args = ['-q','easy_install', '-v']+argv, + script_name = sys.argv[0] or 'easy_install', distclass=DistributionWithoutHelpCommands, **kw ) ) @@ -1596,4 +1597,3 @@ usage: %(script)s [options] requirement_or_url ... - |