move the rest of the path handling code from develop to easy_install

also resuffle the path handlers a bit, hopefully everything works now

--HG--
branch : distribute
extra : rebase_source : dc8e4217f5832b15e8f7287c95732bc68d1e1cf5

1 files changed, 5 insertions, 4 deletions

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 315c1ac8..10b2be9e 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -28,9 +28,9 @@ class TestDevelopTest(unittest.TestCase):
         os.chdir(self.dir)
         if sys.version >= "2.6":
             self.old_base = site.USER_BASE
-            site.USER_BASE = easy_install_pkg.USER_BASE = tempfile.mkdtemp()
+            site.USER_BASE = tempfile.mkdtemp()
             self.old_site = site.USER_SITE
-            site.USER_SITE = easy_install_pkg.USER_SITE = tempfile.mkdtemp()
+            site.USER_SITE = tempfile.mkdtemp()
 
     def tearDown(self): 
         os.chdir(self.old_cwd)
@@ -38,8 +38,8 @@ class TestDevelopTest(unittest.TestCase):
         if sys.version >= "2.6":
             shutil.rmtree(site.USER_BASE)
             shutil.rmtree(site.USER_SITE)
-            easy_install_pkg.USER_BASE = site.USER_BASE = self.old_base
-            easy_install_pkg.USER_SITE = site.USER_SITE = self.old_site
+            site.USER_BASE = self.old_base
+            site.USER_SITE = self.old_site
 
     def test_develop(self):
         if sys.version < "2.6":
@@ -49,6 +49,7 @@ class TestDevelopTest(unittest.TestCase):
         cmd = develop(dist)
         cmd.user = 1
         cmd.ensure_finalized()
+        cmd.install_dir = site.USER_SITE
         cmd.user = 1
         old_stdout = sys.stdout
         sys.stdout = StringIO()