Commit 6267e434 authored by Jason R. Coombs's avatar Jason R. Coombs

Remove Python 2.5 compatibility in easy_install test setup.

parent d52f1865
......@@ -140,7 +140,7 @@ class TestUserInstallTest(unittest.TestCase):
f.close()
self.old_cwd = os.getcwd()
os.chdir(self.dir)
if sys.version >= "2.6":
self.old_enable_site = site.ENABLE_USER_SITE
self.old_file = easy_install_pkg.__file__
self.old_base = site.USER_BASE
......@@ -152,7 +152,7 @@ class TestUserInstallTest(unittest.TestCase):
def tearDown(self):
os.chdir(self.old_cwd)
shutil.rmtree(self.dir)
if sys.version >= "2.6":
shutil.rmtree(site.USER_BASE)
shutil.rmtree(site.USER_SITE)
site.USER_BASE = self.old_base
......@@ -163,8 +163,6 @@ class TestUserInstallTest(unittest.TestCase):
def test_user_install_implied(self):
site.ENABLE_USER_SITE = True # disabled sometimes
#XXX: replace with something meaningfull
if sys.version < "2.6":
return #SKIP
dist = Distribution()
dist.script_name = 'setup.py'
cmd = easy_install(dist)
......@@ -180,8 +178,6 @@ class TestUserInstallTest(unittest.TestCase):
def test_user_install_not_implied_without_usersite_enabled(self):
site.ENABLE_USER_SITE = False # usually enabled
#XXX: replace with something meaningfull
if sys.version < "2.6":
return #SKIP
dist = Distribution()
dist.script_name = 'setup.py'
cmd = easy_install(dist)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment