[Python-checkins] cpython (merge default -> default): Merge.

[stefan.krah]

http://hg.python.org/cpython/rev/44c6997191d3
changeset:   76078:44c6997191d3
parent:      76077:5fe882b2e00f
parent:      76076:e97940f701be
user:        Stefan Krah <skrah at bytereef.org>
date:        Mon Apr 02 20:59:15 2012 +0200
summary:
  Merge.

files:
  Lib/test/test_thread.py |  1 -
  1 files changed, 0 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@@ -132,7 +132,6 @@
         # See issue #14474
         def task():
             started.release()
-            sys.stderr = stderr
             raise SyntaxError
         def mywrite(self, *args):
             try:

-- 
Repository URL: http://hg.python.org/cpython