Merge fix for #21

CHANGES.txt

@@ -9,6 +9,12 @@ CHANGES
 * Code base now runs on Python 2.4 - Python 3.3 without Python 2to3
   conversion.
 
+-----
+0.7.5
+-----
+
+* Issue #21: Restore Python 2.4 compatibility in ``test_easy_install``.
+
 -----
 0.7.4
 -----

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