diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-08-18 18:40:08 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-08-18 18:40:08 (GMT) |
| commit | fae4c62b1afadea6167682b2b9bd7e7e67d5de17 (patch) | |
| tree | 31d5978e52ec1f139c476a4ff182300b05e6b9bc /Lib/test/test_multiprocessing.py | |
| parent | 6640d7262874520ad405173c0f2d4b48b1837a8d (diff) | |
| download | cpython-fae4c62b1afadea6167682b2b9bd7e7e67d5de17.zip cpython-fae4c62b1afadea6167682b2b9bd7e7e67d5de17.tar.gz cpython-fae4c62b1afadea6167682b2b9bd7e7e67d5de17.tar.bz2 | |
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
........
Diffstat (limited to 'Lib/test/test_multiprocessing.py')
| -rw-r--r-- | Lib/test/test_multiprocessing.py | 10 |
1 files changed, 8 insertions, 2 deletions
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 @@ class _TestCondition(BaseTestCase): 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 |