Merged revisions 64125 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r64125 | benjamin.peterson | 2008-06-11 12:27:50 -0500 (Wed, 11 Jun 2008) | 2 lines
give the threading API PEP 8 names
........
diff --git a/Lib/test/test_queue.py b/Lib/test/test_queue.py
index 6303117..22cdcad 100644
--- a/Lib/test/test_queue.py
+++ b/Lib/test/test_queue.py
@@ -52,11 +52,11 @@
self.t.start()
self.result = block_func(*block_args)
# If block_func returned before our thread made the call, we failed!
- if not self.t.startedEvent.isSet():
+ if not self.t.startedEvent.is_set():
self.fail("blocking function '%r' appeared not to block" %
block_func)
self.t.join(10) # make sure the thread terminates
- if self.t.isAlive():
+ if self.t.is_alive():
self.fail("trigger function '%r' appeared to not return" %
trigger_func)
return self.result
@@ -76,10 +76,10 @@
expected_exception_class)
finally:
self.t.join(10) # make sure the thread terminates
- if self.t.isAlive():
+ if self.t.is_alive():
self.fail("trigger function '%r' appeared to not return" %
trigger_func)
- if not self.t.startedEvent.isSet():
+ if not self.t.startedEvent.is_set():
self.fail("trigger thread ended but event never set")