Merge fix for #21

8c893ea5 · Jason R. Coombs · 1f98cb28 · 54cea58c · 8c893ea5 · 8c893ea5
Commit 8c893ea5 authored Jun 19, 2013 by Jason R. Coombs
Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 5 deletions

CHANGES.txt CHANGES.txt +6 -0

setuptools/tests/test_easy_install.py setuptools/tests/test_easy_install.py +6 -5

No files found.
--- a/CHANGES.txt
+++ b/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
 -----

--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -271,6 +271,7 @@ class TestUserInstallTest(unittest.TestCase):
        old_stderr = sys.stderr
        sys.stdout = StringIO()
        sys.stderr = StringIO()
+        try:
            try:
                reset_setup_stop_context(
                    lambda: run_setup(test_setup_py, ['install'])