Oops. I didn't expect that some tests (test_cookie) have expected
output *and* doctest stuff. Assuming the doctest stuff comes after the
expected output, this fixes that.
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index a69fd41..c8c9167 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -287,7 +287,7 @@
else:
cfp = StringIO.StringIO()
try:
- save_stdout = sys.stdout
+ sys.save_stdout = sys.stdout
try:
if cfp:
sys.stdout = cfp
@@ -301,14 +301,7 @@
if indirect_test is not None:
indirect_test()
finally:
- sys.stdout = save_stdout
- if cfp and test_support.output_comparison_denied():
- output = cfp.getvalue()
- cfp = None
- s = test + "\n"
- if output.startswith(s):
- output = output[len(s):]
- sys.stdout.write(output)
+ sys.stdout = sys.save_stdout
except (ImportError, test_support.TestSkipped), msg:
if not quiet:
print "test", test, "skipped --", msg
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index 0a96f66..a9452fc 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -32,6 +32,7 @@
def deny_output_comparison():
global _output_comparison
_output_comparison = 0
+ sys.stdout = sys.save_stdout
# regrtest's interface to _output_comparison.
def output_comparison_denied():