From 8d2a90af2dd04877e5df4c12fd71e1ae86a3b7b9 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Tue, 1 Apr 2008 12:37:43 +0000 Subject: Generalize test.test_support.test_stdout() with a base context manager so that it is easy to capture stderr if desired. --- Lib/test/test_support.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py index 1c89d5b..7a5f30a 100644 --- 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") #======================================================================= -- cgit v0.12