aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt6
-rw-r--r--setuptools/tests/test_easy_install.py11
2 files changed, 12 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 3daa48ba..bed92b35 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,12 @@ CHANGES
conversion.
-----
+0.7.5
+-----
+
+* Issue #21: Restore Python 2.4 compatibility in ``test_easy_install``.
+
+-----
0.7.4
-----
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index b0609eb1..2732bb3e 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -272,11 +272,12 @@ class TestUserInstallTest(unittest.TestCase):
sys.stdout = StringIO()
sys.stderr = StringIO()
try:
- reset_setup_stop_context(
- lambda: run_setup(test_setup_py, ['install'])
- )
- except SandboxViolation:
- self.fail('Installation caused SandboxViolation')
+ try:
+ reset_setup_stop_context(
+ lambda: run_setup(test_setup_py, ['install'])
+ )
+ except SandboxViolation:
+ self.fail('Installation caused SandboxViolation')
finally:
sys.stdout = old_stdout
sys.stderr = old_stderr