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

3 files changed, 4 insertions, 8 deletions

diff --git a/setup.py b/setup.py
index 8f350c4e..a9b7bb0f 100755
--- a/setup.py
+++ b/setup.py
@@ -158,20 +158,18 @@ dist = setup(
     test_suite = 'setuptools.tests',
     src_root = src_root,
     packages = find_packages(),
-    package_data = {'setuptools':['*.exe'], 'setuptools.command':['*.xml']},
+    package_data = {'setuptools':['*.exe', 'site-patch.py'], 'setuptools.command':['*.xml']},
 
-    py_modules = ['pkg_resources', 'easy_install', 'site'],
+    py_modules = ['pkg_resources', 'easy_install'],
 
     zip_safe = (sys.version>="2.5"),   # <2.5 needs unzipped for -m to work
 
     cmdclass = {'test': test},
     entry_points = {
-
         "distutils.commands" : [
             "%(cmd)s = setuptools.command.%(cmd)s:%(cmd)s" % locals()
             for cmd in SETUP_COMMANDS
         ],
-
         "distutils.setup_keywords": [
             "eager_resources        = setuptools.dist:assert_string_list",
             "namespace_packages     = setuptools.dist:check_nsp",
@@ -192,7 +190,6 @@ dist = setup(
             "use_2to3_fixers        = setuptools.dist:assert_string_list",
             "use_2to3_exclude_fixers = setuptools.dist:assert_string_list",
         ],
-
         "egg_info.writers": [
             "PKG-INFO = setuptools.command.egg_info:write_pkg_info",
             "requires.txt = setuptools.command.egg_info:write_requirements",
@@ -203,7 +200,6 @@ dist = setup(
             "depends.txt = setuptools.command.egg_info:warn_depends_obsolete",
             "dependency_links.txt = setuptools.command.egg_info:overwrite_arg",
         ],
-
         "console_scripts": console_scripts,
 
         "setuptools.file_finders":
@@ -211,7 +207,7 @@ dist = setup(
 
         "setuptools.installation":
             ['eggsecutable = setuptools.command.easy_install:bootstrap'],
-        },
+    },
 
 
     classifiers = textwrap.dedent("""
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):
diff --git a/site.py b/setuptools/site-patch.py
index a7166f14..a7166f14 100755..100644
--- a/site.py
+++ b/setuptools/site-patch.py