aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/tests/test_easy_install.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-06-19 15:22:49 -0500
committerJason R. Coombs <jaraco@jaraco.com>2013-06-19 15:22:49 -0500
commitcc4d57dcb6b12fe3b4bf20b9f848d71986723763 (patch)
tree9d96e52ef57d8dffe74a509e37e6fc2de690a7f8 /setuptools/tests/test_easy_install.py
parentaa2269f68c8708f6498300f7d0a93a3a5eba562f (diff)
downloadexternal_python_setuptools-cc4d57dcb6b12fe3b4bf20b9f848d71986723763.tar.gz
external_python_setuptools-cc4d57dcb6b12fe3b4bf20b9f848d71986723763.tar.bz2
external_python_setuptools-cc4d57dcb6b12fe3b4bf20b9f848d71986723763.zip
Restore Python 2.4 compatibility in test_easy_install. Fixes #21
Diffstat (limited to 'setuptools/tests/test_easy_install.py')
-rw-r--r--setuptools/tests/test_easy_install.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 395056e7..d17a5340 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.StringIO()
sys.stderr = StringIO.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