diff options
| author | phillip.eby <phillip.eby@6015fed2-1504-0410-9fe1-9d1591cc4771> | 2006-04-14 19:38:38 +0000 |
|---|---|---|
| committer | phillip.eby <phillip.eby@6015fed2-1504-0410-9fe1-9d1591cc4771> | 2006-04-14 19:38:38 +0000 |
| commit | 768c5f87b5ba8e7ef729e68fcceae18050d1bf42 (patch) | |
| tree | 45082f374bdf708fac90afa30382bdec453db109 /setuptools/command | |
| parent | d92ce2652a52ad988f6c67022052aea983c43515 (diff) | |
| download | python-setuptools-768c5f87b5ba8e7ef729e68fcceae18050d1bf42.tar.gz | |
First round of prepping setuptools for inclusion in Python 2.5: move
site.py to setuptools/site-patch.py; reinstate 'python -m easy_install'
support; use distutils' "upload" command when running under 2.5.
git-svn-id: http://svn.python.org/projects/sandbox/trunk/setuptools@45405 6015fed2-1504-0410-9fe1-9d1591cc4771
Diffstat (limited to 'setuptools/command')
| -rw-r--r-- | setuptools/command/__init__.py | 7 | ||||
| -rwxr-xr-x | setuptools/command/easy_install.py | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py index d5e965e..03bb9dd 100644 --- a/setuptools/command/__init__.py +++ b/setuptools/command/__init__.py @@ -4,6 +4,11 @@ __all__ = [ 'sdist', 'setopt', 'test', 'upload', 'install_egg_info', '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 @@ -11,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 3507d4e..1af063d 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -1073,7 +1073,7 @@ Please make the appropriate changes for your system and try again.""" % ( return # already did it, or don't need to sitepy = os.path.join(self.install_dir, "site.py") - source = resource_string(Requirement.parse("setuptools"), "site.py") + source = resource_string("setuptools", "site-patch.py") current = "" if os.path.exists(sitepy): |