make test_support's captured_output a bit more robust when exceptions happen

d8f2d0bd · Benjamin Peterson · 63b0a2eb · d8f2d0bd
Commit d8f2d0bd authored Apr 30, 2008 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

Lib/test/test_support.py Lib/test/test_support.py +4 -2

No files found.
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -482,8 +482,10 @@ def captured_output(stream_name):
    import StringIO
    orig_stdout = getattr(sys, stream_name)
    setattr(sys, stream_name, StringIO.StringIO())
-    yield getattr(sys, stream_name)
-    setattr(sys, stream_name, orig_stdout)
+    try:
+        yield getattr(sys, stream_name)
+    finally:
+        setattr(sys, stream_name, orig_stdout)

 def captured_stdout():
    return captured_output("stdout")