summaryrefslogtreecommitdiffstats
path: root/Lib/test/threaded_import_hangers.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-06-11 19:14:14 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-06-11 19:14:14 (GMT)
commit672b8031a803fa420cac91cdaab02130c1f8bed0 (patch)
treecff73aa339853806887dd85bf1df34f088532efe /Lib/test/threaded_import_hangers.py
parent559e5d7f4d1155e95fb6f925c927a263f9196935 (diff)
downloadcpython-672b8031a803fa420cac91cdaab02130c1f8bed0.zip
cpython-672b8031a803fa420cac91cdaab02130c1f8bed0.tar.gz
cpython-672b8031a803fa420cac91cdaab02130c1f8bed0.tar.bz2
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 ........
Diffstat (limited to 'Lib/test/threaded_import_hangers.py')
-rw-r--r--Lib/test/threaded_import_hangers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/threaded_import_hangers.py b/Lib/test/threaded_import_hangers.py
index b21c52f..d750874 100644
--- a/Lib/test/threaded_import_hangers.py
+++ b/Lib/test/threaded_import_hangers.py
@@ -38,5 +38,5 @@ for name, func, args in [
t = Worker(func, args)
t.start()
t.join(TIMEOUT)
- if t.isAlive():
+ if t.is_alive():
errors.append("%s appeared to hang" % name)