make HAS_USER_SITE depend on site.ENABLE_USER_SITE

--HG--
branch : distribute
extra : rebase_source : e7fb6337b41ea732acd41bab92a57471f3632777

setuptools/command/easy_install.py

@@ -39,7 +39,7 @@
 ]
 
 import site
-HAS_USER_SITE = not sys.version < "2.6"
+HAS_USER_SITE = not sys.version < "2.6" and site.ENABLE_USER_SITE
 
 def samefile(p1,p2):
     if hasattr(os.path,'samefile') and (
@@ -122,7 +122,7 @@ class easy_install(Command):
     create_index = PackageIndex
 
     def initialize_options(self):
-        if HAS_USER_SITE and site.ENABLE_USER_SITE:
+        if HAS_USER_SITE:
             whereami = os.path.abspath(__file__)
             self.user = whereami.startswith(site.USER_SITE)
         else:
@@ -1347,8 +1347,7 @@ def get_site_dirs():
         site_lib = get_python_lib(plat_specific)
         if site_lib not in sitedirs: sitedirs.append(site_lib)
 
-    if sys.version >= "2.6":
-        import site
+    if HAS_USER_SITE:
         sitedirs.append(site.USER_SITE)
 
     sitedirs = map(normalize_path, sitedirs)

setuptools/tests/test_easy_install.py

@@ -158,7 +158,7 @@ def setUp(self):
         self.old_cwd = os.getcwd()
         os.chdir(self.dir)
         if sys.version >= "2.6":
-            self.old_enable = site.ENABLE_USER_SITE
+            self.old_has_site = easy_install_pkg.HAS_USER_SITE
             self.old_file = easy_install_pkg.__file__
             self.old_base = site.USER_BASE
             site.USER_BASE = tempfile.mkdtemp()
@@ -174,11 +174,11 @@ def tearDown(self):
             shutil.rmtree(site.USER_SITE)
             site.USER_BASE = self.old_base
             site.USER_SITE = self.old_site
-            site.ENABLE_USER_SITE = self.old_enable
+            easy_install_pkg.HAS_USER_SITE = self.old_has_site
             easy_install_pkg.__file__ = self.old_file
 
     def test_user_install_implied(self):
-        site.ENABLE_USER_SITE = True # disabled sometimes
+        easy_install_pkg.HAS_USER_SITE = True # disabled sometimes
         #XXX: replace with something meaningfull
         if sys.version < "2.6":
             return #SKIP
@@ -195,7 +195,7 @@ def test_multiproc_atexit(self):
         _LOG.info('this should not break')
 
     def test_user_install_not_implied_without_usersite_enabled(self):
-        site.ENABLE_USER_SITE = False # disabled sometimes
+        easy_install_pkg.HAS_USER_SITE = False # usually enabled
         #XXX: replace with something meaningfull
         if sys.version < "2.6":
             return #SKIP