summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing
diff options
context:
space:
mode:
authorRichard Oudkerk <shibturn@gmail.com>2012-05-25 12:04:20 (GMT)
committerRichard Oudkerk <shibturn@gmail.com>2012-05-25 12:04:20 (GMT)
commitbe39cfc9dc52c3fd5861c2107c746ae113f0f1bf (patch)
treefa88c834712be2c14508338dfb8fe43387360db6 /Lib/multiprocessing
parent9866d96e48e884edb8d7db468c03db316503bbbc (diff)
parent54454e7dc25f8ce5aef87a4faed89aca19067815 (diff)
downloadcpython-be39cfc9dc52c3fd5861c2107c746ae113f0f1bf.zip
cpython-be39cfc9dc52c3fd5861c2107c746ae113f0f1bf.tar.gz
cpython-be39cfc9dc52c3fd5861c2107c746ae113f0f1bf.tar.bz2
Merge
Diffstat (limited to 'Lib/multiprocessing')
-rw-r--r--Lib/multiprocessing/dummy/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/multiprocessing/dummy/__init__.py b/Lib/multiprocessing/dummy/__init__.py
index 056acfc..9bf8f6b 100644
--- a/Lib/multiprocessing/dummy/__init__.py
+++ b/Lib/multiprocessing/dummy/__init__.py
@@ -68,7 +68,8 @@ class DummyProcess(threading.Thread):
def start(self):
assert self._parent is current_process()
self._start_called = True
- self._parent._children[self] = None
+ if hasattr(self._parent, '_children'):
+ self._parent._children[self] = None
threading.Thread.start(self)
@property