[Python-checkins] cpython (merge 3.2 -> default): Merge

[richard.oudkerk]

http://hg.python.org/cpython/rev/9373ca8c6c55
changeset:   77139:9373ca8c6c55
parent:      77136:d2b511592cc5
parent:      77138:0528ec18e230
user:        Richard Oudkerk <shibturn at gmail.com>
date:        Fri May 25 13:04:20 2012 +0100
summary:
  Merge

files:
  Lib/multiprocessing/dummy/__init__.py |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/multiprocessing/dummy/__init__.py b/Lib/multiprocessing/dummy/__init__.py
--- a/Lib/multiprocessing/dummy/__init__.py
+++ b/Lib/multiprocessing/dummy/__init__.py
@@ -68,7 +68,8 @@
     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

-- 
Repository URL: http://hg.python.org/cpython