From 25d7976014bdf4a96fa242a3f86ff3ffe5a514eb Mon Sep 17 00:00:00 2001 From: Michael Foord Date: Fri, 2 Apr 2010 22:30:56 +0000 Subject: unittest tests no longer replace the sys.stdout put in place by regrtest --- Lib/unittest/result.py | 8 ++------ Lib/unittest/test/test_result.py | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Lib/unittest/result.py b/Lib/unittest/result.py index cb6d41c..5cab30e 100644 --- a/Lib/unittest/result.py +++ b/Lib/unittest/result.py @@ -19,10 +19,6 @@ def failfast(method): return method(self, *args, **kw) return inner - -_std_out = sys.stdout -_std_err = sys.stderr - NEWLINE = os.linesep STDOUT_LINE = '%sStdout:%s%%s' % (NEWLINE, NEWLINE) STDERR_LINE = '%sStderr:%s%%s' % (NEWLINE, NEWLINE) @@ -89,8 +85,8 @@ class TestResult(object): error += NEWLINE self._original_stderr.write(STDERR_LINE % error) - sys.stdout = _std_out - sys.stderr = _std_err + sys.stdout = self._original_stdout + sys.stderr = self._original_stderr self._stdout_buffer.seek(0) self._stdout_buffer.truncate() self._stderr_buffer.seek(0) diff --git a/Lib/unittest/test/test_result.py b/Lib/unittest/test/test_result.py index c483c7d..c02b8ef 100644 --- a/Lib/unittest/test/test_result.py +++ b/Lib/unittest/test/test_result.py @@ -422,8 +422,8 @@ class TestOutputBuffering(unittest.TestCase): result.addSuccess(self) result.stopTest(self) - self.assertIs(real_out, sys.stdout) - self.assertIs(real_err, sys.stderr) + self.assertIs(sys.stdout, result._original_stdout) + self.assertIs(sys.stderr, result._original_stderr) self.assertEqual(result._original_stdout.getvalue(), '') self.assertEqual(result._original_stderr.getvalue(), '') -- cgit v0.12