diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-19 15:25:42 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-19 15:25:42 -0500 |
| commit | 8c893ea506739395f28b26acd45a951983bc8aa4 (patch) | |
| tree | 884910f3333286aceb045f96b325792eff97e917 | |
| parent | 1f98cb2880de5d716933ada52604044cbe5b3cbc (diff) | |
| parent | 54cea58c9eb477f8d53c44a6555dbc1f7531fbb8 (diff) | |
| download | external_python_setuptools-8c893ea506739395f28b26acd45a951983bc8aa4.tar.gz external_python_setuptools-8c893ea506739395f28b26acd45a951983bc8aa4.tar.bz2 external_python_setuptools-8c893ea506739395f28b26acd45a951983bc8aa4.zip | |
Merge fix for #21
| -rw-r--r-- | CHANGES.txt | 6 | ||||
| -rw-r--r-- | setuptools/tests/test_easy_install.py | 11 |
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 |