summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing
diff options
context:
space:
mode:
authorRichard Oudkerk <shibturn@gmail.com>2012-05-03 17:29:02 (GMT)
committerRichard Oudkerk <shibturn@gmail.com>2012-05-03 17:29:02 (GMT)
commita6becaa9cbe40aebbac1699b12163f9229a79f09 (patch)
treeb36b79e3340da555263d1168067dade0f3baf3be /Lib/multiprocessing
parentbf4e2663975b87e646fc75b7fc6897879d40f272 (diff)
downloadcpython-a6becaa9cbe40aebbac1699b12163f9229a79f09.zip
cpython-a6becaa9cbe40aebbac1699b12163f9229a79f09.tar.gz
cpython-a6becaa9cbe40aebbac1699b12163f9229a79f09.tar.bz2
Fix dangling warning for test_multiprocessing
Diffstat (limited to 'Lib/multiprocessing')
-rw-r--r--Lib/multiprocessing/managers.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
index f47402a..dc8166a 100644
--- a/Lib/multiprocessing/managers.py
+++ b/Lib/multiprocessing/managers.py
@@ -548,7 +548,10 @@ class BaseManager(object):
'''
Join the manager process (if it has been spawned)
'''
- self._process.join(timeout)
+ if self._process is not None:
+ self._process.join(timeout)
+ if not self._process.is_alive():
+ self._process = None
def _debug_info(self):
'''