Now install_site works properly with distribute distribution. fixes #44

--HG--
branch : distribute
extra : rebase_source : 5dacd496be767ed406f7f8c76a598e7f186acdbc

3 files changed, 28 insertions, 2 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index a82857b3..2574300a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,12 @@ CHANGES
 0.6.2
 -----
 
+setuptools
+==========
+
+* Fixed invalid usage of requirement.parse, that broke develop -d.
+  closed http://bugs.python.org/setuptools/issue44.
+
 
 -----
 0.6.1
@@ -18,7 +24,7 @@ setuptools
   This closes http://bitbucket.org/tarek/distribute/issue/16 and
   http://bitbucket.org/tarek/distribute/issue/18.
 
-* zip_ok is now True by default. This closes 
+* zip_ok is now False by default. This closes 
   http://bugs.python.org/setuptools/issue33.
 
 * Fixed invalid URL error catching. http://bugs.python.org/setuptools/issue20.
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 0fa07845..67cf949f 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1078,7 +1078,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(Requirement.parse("distribute"), "site.py")
         current = ""
 
         if os.path.exists(sitepy):
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
new file mode 100644
index 00000000..583c072b
--- /dev/null
+++ b/setuptools/tests/test_easy_install.py
@@ -0,0 +1,20 @@
+"""Easy install Tests
+"""
+import os, shutil, tempfile, unittest
+from setuptools.command.easy_install import easy_install
+from setuptools.dist import Distribution
+
+class TestEasyInstallTest(unittest.TestCase):
+
+    def test_install_site_py(self):
+        dist = Distribution()
+        cmd = easy_install(dist)
+        cmd.sitepy_installed = False
+        cmd.install_dir = tempfile.mkdtemp()
+        try:
+            cmd.install_site_py()
+            sitepy = os.path.join(cmd.install_dir, 'site.py')
+            self.assert_(os.path.exists(sitepy))
+        finally:
+            shutil.rmtree(cmd.install_dir)
+