[Python-checkins] r62604 - python/trunk/Lib/test/test_support.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Wed Apr 30 23:03:58 2008
New Revision: 62604

Log:
make test_support's catch_warning a bit more robust when exceptions happen


Modified:
   python/trunk/Lib/test/test_support.py

Modified: python/trunk/Lib/test/test_support.py
==============================================================================
--- python/trunk/Lib/test/test_support.py	(original)
+++ python/trunk/Lib/test/test_support.py	Wed Apr 30 23:03:58 2008
@@ -482,8 +482,10 @@
     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")