Generalize test.test_support.test_stdout() with a base context manager so that

it is easy to capture stderr if desired.

diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index 1c89d5bb193f64726ebea8b5ee60b6bc88556f4c..7a5f30a75262b9e9d95bfbdf50ef1137464b347a 100644 (file)
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -392,19 +392,23 @@ def transient_internet():
 
 
 @contextlib.contextmanager
-def captured_stdout():
-    """Run the with statement body using a StringIO object as sys.stdout.
-    Example use::
+def captured_output(stream_name):
+    """Run the 'with' statement body using a StringIO object in place of a
+    specific attribute on the sys module.
+    Example use (with 'stream_name=stdout')::
 
        with captured_stdout() as s:
            print "hello"
        assert s.getvalue() == "hello"
     """
     import StringIO
-    orig_stdout = sys.stdout
-    sys.stdout = StringIO.StringIO()
-    yield sys.stdout
-    sys.stdout = orig_stdout
+    orig_stdout = getattr(sys, stream_name)
+    setattr(sys, stream_name, StringIO.StringIO())
+    yield getattr(sys, stream_name)
+    setattr(sys, stream_name, orig_stdout)
+
+def captured_stdout():
+    return captured_output("stdout")
 
 
 #=======================================================================