summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-04-02 18:25:55 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-04-02 18:25:55 (GMT)
commitcbb290af08bc97ace72ca1a5ae19fd7375cae938 (patch)
treea2ff577859f84b27a2ed16f8f39c6fed49180960
parent9d2801095f6186a0993259fe558a22c27abeb8be (diff)
parent6215444a0a35cca9c3893e319d309de102d47f28 (diff)
downloadcpython-cbb290af08bc97ace72ca1a5ae19fd7375cae938.zip
cpython-cbb290af08bc97ace72ca1a5ae19fd7375cae938.tar.gz
cpython-cbb290af08bc97ace72ca1a5ae19fd7375cae938.tar.bz2
merge 3.2
-rw-r--r--Lib/test/test_thread.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py
index deb4bf3..41fb3ac 100644
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@@ -132,7 +132,6 @@ class ThreadRunningTests(BasicThreadTest):
# See issue #14474
def task():
started.release()
- sys.stderr = stderr
raise SyntaxError
def mywrite(self, *args):
try: