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

[benjamin.peterson]

http://hg.python.org/cpython/rev/e97940f701be
changeset:   76076:e97940f701be
parent:      76073:09cff57b5541
parent:      76075:98ab6e322c40
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Apr 02 14:25:55 2012 -0400
summary:
  merge 3.2

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