summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Krah <skrah@bytereef.org>2012-04-02 18:59:15 (GMT)
committerStefan Krah <skrah@bytereef.org>2012-04-02 18:59:15 (GMT)
commit4ee2a8a127b99e3f7f1cd4ab17a93b240ab56661 (patch)
tree7652e90b5ffd285aadcabafaa98d740a313c488b
parent91c0274bc441edf07f8923009244bd068e9368d9 (diff)
parentcbb290af08bc97ace72ca1a5ae19fd7375cae938 (diff)
downloadcpython-4ee2a8a127b99e3f7f1cd4ab17a93b240ab56661.zip
cpython-4ee2a8a127b99e3f7f1cd4ab17a93b240ab56661.tar.gz
cpython-4ee2a8a127b99e3f7f1cd4ab17a93b240ab56661.tar.bz2
Merge.
-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: