Merged revisions 65828 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65828 | benjamin.peterson | 2008-08-18 13:31:58 -0500 (Mon, 18 Aug 2008) | 1 line
patch up multiprocessing until it's API can be changed too
........
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 5c1064a..436cad8 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -620,11 +620,17 @@
woken = self.Semaphore(0)
p = self.Process(target=self.f, args=(cond, sleeping, woken))
- p.set_daemon(True)
+ try:
+ p.set_daemon(True)
+ except AttributeError:
+ p.daemon = True
p.start()
p = threading.Thread(target=self.f, args=(cond, sleeping, woken))
- p.set_daemon(True)
+ try:
+ p.set_daemon(True)
+ except AttributeError:
+ p.daemon = True
p.start()
# wait for both children to start sleeping