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

[benjamin.peterson]

http://hg.python.org/cpython/rev/b1bd900cc723
changeset:   76482:b1bd900cc723
parent:      76478:1da623513b26
parent:      76481:1040e3811485
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Apr 23 10:08:20 2012 -0400
summary:
  merge 3.2

files:
  Lib/test/test_thread.py |  2 +-
  1 files changed, 1 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
@@ -148,7 +148,7 @@
             thread.start_new_thread(task, ())
             started.acquire()
             while thread._count() > c:
-                pass
+                time.sleep(0.01)
         self.assertIn("Traceback", stderr.getvalue())
 
 

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