summaryrefslogtreecommitdiff
path: root/Lib/test/test_multiprocessing.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-06-11 19:14:14 +0000
committerBenjamin Peterson <benjamin@python.org>2008-06-11 19:14:14 +0000
commit672b8031a803fa420cac91cdaab02130c1f8bed0 (patch)
treecff73aa339853806887dd85bf1df34f088532efe /Lib/test/test_multiprocessing.py
parent559e5d7f4d1155e95fb6f925c927a263f9196935 (diff)
downloadcpython-git-672b8031a803fa420cac91cdaab02130c1f8bed0.tar.gz
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/test_multiprocessing.py')
-rw-r--r--Lib/test/test_multiprocessing.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index b9a360ac2b..dd40c6edc1 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -632,7 +632,7 @@ class _TestCondition(BaseTestCase):
p.start()
p = threading.Thread(target=self.f, args=(cond, sleeping, woken))
- p.setDaemon(True)
+ p.set_daemon(True)
p.start()
# wait for both children to start sleeping
@@ -679,7 +679,7 @@ class _TestCondition(BaseTestCase):
t = threading.Thread(target=self.f,
args=(cond, sleeping, woken, TIMEOUT1))
- t.setDaemon(True)
+ t.set_daemon(True)
t.start()
# wait for them all to sleep
@@ -701,7 +701,7 @@ class _TestCondition(BaseTestCase):
p.start()
t = threading.Thread(target=self.f, args=(cond, sleeping, woken))
- t.setDaemon(True)
+ t.set_daemon(True)
t.start()
# wait for them to all sleep