From 0960bc586ee5a2a53c5c8c92bd17f03d4d75efef Mon Sep 17 00:00:00 2001
From: "R. David Murray" <rdmurray@bitdance.com>
Date: Sat, 4 Dec 2010 17:24:46 +0000
Subject: [PATCH] Merged revisions 85086 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85086 | r.david.murray | 2010-09-28 21:08:05 -0400 (Tue, 28 Sep 2010) | 4 lines

  #7110: have regrtest print test failures and tracebacks to stderr not stdout.

  Patch by Sandro Tosi.
........
---
 Lib/test/regrtest.py | 12 ++++++------
 Misc/ACKS            |  1 +
 Misc/NEWS            |  6 ++++++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index deb422903d0b..9f038c4d6a13 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -894,16 +894,16 @@ def runtest_inner(test, verbose, quiet,
     except KeyboardInterrupt:
         raise
     except test_support.TestFailed, msg:
-        print "test", test, "failed --", msg
-        sys.stdout.flush()
+        print >>sys.stderr, "test", test, "failed --", msg
+        sys.stderr.flush()
         return FAILED, test_time
     except:
         type, value = sys.exc_info()[:2]
-        print "test", test, "crashed --", str(type) + ":", value
-        sys.stdout.flush()
+        print >>sys.stderr, "test", test, "crashed --", str(type) + ":", value
+        sys.stderr.flush()
         if verbose:
-            traceback.print_exc(file=sys.stdout)
-            sys.stdout.flush()
+            traceback.print_exc(file=sys.stderr)
+            sys.stderr.flush()
         return FAILED, test_time
     else:
         if refleak:
diff --git a/Misc/ACKS b/Misc/ACKS
index 4cd835045707..24c072c36879 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -791,6 +791,7 @@ Frank J. Tobin
 R Lindsay Todd
 Bennett Todd
 Matias Torchinsky
+Sandro Tosi
 Richard Townsend
 Laurence Tratt
 John Tromp
diff --git a/Misc/NEWS b/Misc/NEWS
index 79ee4a2fcdb4..6ca939a1c9ad 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -24,6 +24,12 @@ Library
 
 - Issue #10464: netrc now correctly handles lines with embedded '#' characters.
 
+Tests
+-----
+
+- Issue #7110: regrtest now sends test failure reports and single-failure
+  tracebacks to stderr rather than stdout.
+
 
 What's New in Python 2.7.1?
 ===========================