From 4dcb7be696f79766297e579b8d0aea87c5218e49 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Sat, 14 May 2011 08:19:43 +0300 Subject: [PATCH] #7960: fix docstrings for captured_output and captured_stdout. --- Lib/test/test_support.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py index e2377093664..81bb3ca017d 100644 --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -814,14 +814,8 @@ def transient_internet(resource_name, timeout=30.0, errnos=()): @contextlib.contextmanager 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" - """ + """Return a context manager used by captured_stdout and captured_stdin + that temporarily replaces the sys stream *stream_name* with a StringIO.""" import StringIO orig_stdout = getattr(sys, stream_name) setattr(sys, stream_name, StringIO.StringIO()) @@ -831,6 +825,12 @@ def captured_output(stream_name): setattr(sys, stream_name, orig_stdout) def captured_stdout(): + """Capture the output of sys.stdout: + + with captured_stdout() as s: + print "hello" + self.assertEqual(s.getvalue(), "hello") + """ return captured_output("stdout") def captured_stdin():