diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-11-27 14:12:05 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-11-27 14:12:05 -0500 |
| commit | d52f1865ccc7cc10389ff731ff4e84302fd83010 (patch) | |
| tree | 68a5b1f5778caf370fb82cc10b360538de65cfaa /setuptools/tests/test_easy_install.py | |
| parent | 57bf0b99a118d93749fdeef7aad95c7d82e53be6 (diff) | |
| download | external_python_setuptools-d52f1865ccc7cc10389ff731ff4e84302fd83010.tar.gz external_python_setuptools-d52f1865ccc7cc10389ff731ff4e84302fd83010.tar.bz2 external_python_setuptools-d52f1865ccc7cc10389ff731ff4e84302fd83010.zip | |
Remove easy_install.HAS_USER_SITE and just defer to site.ENABLE_USER_SITE.
Diffstat (limited to 'setuptools/tests/test_easy_install.py')
| -rw-r--r-- | setuptools/tests/test_easy_install.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py index 189e3d55..bb1615d3 100644 --- a/setuptools/tests/test_easy_install.py +++ b/setuptools/tests/test_easy_install.py @@ -141,7 +141,7 @@ class TestUserInstallTest(unittest.TestCase): self.old_cwd = os.getcwd() os.chdir(self.dir) if sys.version >= "2.6": - self.old_has_site = easy_install_pkg.HAS_USER_SITE + self.old_enable_site = site.ENABLE_USER_SITE self.old_file = easy_install_pkg.__file__ self.old_base = site.USER_BASE site.USER_BASE = tempfile.mkdtemp() @@ -157,11 +157,11 @@ class TestUserInstallTest(unittest.TestCase): shutil.rmtree(site.USER_SITE) site.USER_BASE = self.old_base site.USER_SITE = self.old_site - easy_install_pkg.HAS_USER_SITE = self.old_has_site + site.ENABLE_USER_SITE = self.old_enable_site easy_install_pkg.__file__ = self.old_file def test_user_install_implied(self): - easy_install_pkg.HAS_USER_SITE = True # disabled sometimes + site.ENABLE_USER_SITE = True # disabled sometimes #XXX: replace with something meaningfull if sys.version < "2.6": return #SKIP @@ -178,7 +178,7 @@ class TestUserInstallTest(unittest.TestCase): _LOG.info('this should not break') def test_user_install_not_implied_without_usersite_enabled(self): - easy_install_pkg.HAS_USER_SITE = False # usually enabled + site.ENABLE_USER_SITE = False # usually enabled #XXX: replace with something meaningfull if sys.version < "2.6": return #SKIP |