aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/command/easy_install.py
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2006-04-14 19:38:38 +0000
committerPJ Eby <distutils-sig@python.org>2006-04-14 19:38:38 +0000
commit8c89c9438e9e461acc7587b60c79fb94b4d1f06d (patch)
treeb5e4fe21baa4f7ff85a76112a6eff50d83becb0c /setuptools/command/easy_install.py
parent3b9a57a0c80ee11995fbe937e7dbeca3d83ec10a (diff)
downloadexternal_python_setuptools-8c89c9438e9e461acc7587b60c79fb94b4d1f06d.tar.gz
external_python_setuptools-8c89c9438e9e461acc7587b60c79fb94b4d1f06d.tar.bz2
external_python_setuptools-8c89c9438e9e461acc7587b60c79fb94b4d1f06d.zip
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. --HG-- branch : distribute extra : source : fbb6c89a74aa47a556a936202d2e50051b067940 extra : histedit_source : 778122fc56bcca6f5a1dbd5a475df11d29028730
Diffstat (limited to 'setuptools/command/easy_install.py')
-rwxr-xr-xsetuptools/command/easy_install.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index df6107d7..77b0bc31 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1277,7 +1277,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("distribute"), "site.py")
+ source = resource_string("setuptools", "site-patch.py")
current = ""
if os.path.exists(sitepy):