diff -ur ../py3k/Doc/library/multiprocessing.rst ./Doc/library/multiprocessing.rst --- ../py3k/Doc/library/multiprocessing.rst 2009-03-31 08:41:03.000000000 +0200 +++ ./Doc/library/multiprocessing.rst 2009-03-31 08:52:45.000000000 +0200 @@ -1119,9 +1119,10 @@ ``current_process().authkey``. Otherwise *authkey* is used and it must be a string. - .. method:: start() + .. method:: start([initializer[, initargs]]) - Start a subprocess to start the manager. + Start a subprocess to start the manager. If *initializer* is not ``None`` + then the subprocess will call ``initializer(*initargs)`` when it starts. .. method:: serve_forever() diff -ur ../py3k/Lib/multiprocessing/managers.py ./Lib/multiprocessing/managers.py --- ../py3k/Lib/multiprocessing/managers.py 2009-03-31 08:41:04.000000000 +0200 +++ ./Lib/multiprocessing/managers.py 2009-03-31 08:48:41.000000000 +0200 @@ -478,12 +478,15 @@ dispatch(conn, None, 'dummy') self._state.value = State.STARTED - def start(self): + def start(self, initializer=None, initargs=()): ''' Spawn a server process for this manager object ''' assert self._state.value == State.INITIAL + if initializer is not None and not hasattr(initializer, '__call__'): + raise TypeError('initializer must be a callable') + # pipe over which we will retrieve address of server reader, writer = connection.Pipe(duplex=False) @@ -491,7 +494,7 @@ self._process = Process( target=type(self)._run_server, args=(self._registry, self._address, self._authkey, - self._serializer, writer), + self._serializer, writer, initializer, initargs), ) ident = ':'.join(str(i) for i in self._process._identity) self._process.name = type(self).__name__ + '-' + ident @@ -512,10 +515,14 @@ ) @classmethod - def _run_server(cls, registry, address, authkey, serializer, writer): + def _run_server(cls, registry, address, authkey, serializer, writer, + initializer=None, initargs=()): ''' Create a server, report its address and run it ''' + if initializer is not None: + initializer(*initargs) + # create server server = cls._Server(registry, address, authkey, serializer) diff -ur ../py3k/Lib/multiprocessing/pool.py ./Lib/multiprocessing/pool.py --- ../py3k/Lib/multiprocessing/pool.py 2009-03-31 08:41:04.000000000 +0200 +++ ./Lib/multiprocessing/pool.py 2009-03-31 08:48:32.000000000 +0200 @@ -92,6 +92,9 @@ except NotImplementedError: processes = 1 + if initializer is not None and not hasattr(initializer, '__call__'): + raise TypeError('initializer must be a callable') + self._pool = [] for i in range(processes): w = self.Process( diff -ur ../py3k/Lib/test/test_multiprocessing.py ./Lib/test/test_multiprocessing.py --- ../py3k/Lib/test/test_multiprocessing.py 2009-03-31 08:41:09.000000000 +0200 +++ ./Lib/test/test_multiprocessing.py 2009-03-31 08:50:12.000000000 +0200 @@ -1831,7 +1831,37 @@ multiprocessing.connection.answer_challenge, _FakeConnection(), b'abc') -testcases_other = [OtherTest, TestInvalidHandle] +# +# Test Manager.start()/Pool.__init__() initializer feature - see issue 5585 +# + +def initializer(ns): + ns.test += 1 + +class TestInitializers(unittest.TestCase): + def setUp(self): + self.mgr = multiprocessing.Manager() + self.ns = self.mgr.Namespace() + self.ns.test = 0 + + def tearDown(self): + self.mgr.shutdown() + + def test_manager_initializer(self): + m = multiprocessing.managers.SyncManager() + self.assertRaises(TypeError, m.start, 1) + m.start(initializer, (self.ns,)) + self.assertEqual(self.ns.test, 1) + m.shutdown() + + def test_pool_initializer(self): + self.assertRaises(TypeError, multiprocessing.Pool, initializer=1) + p = multiprocessing.Pool(1, initializer, (self.ns,)) + p.close() + p.join() + self.assertEqual(self.ns.test, 1) + +testcases_other = [OtherTest, TestInvalidHandle, TestInitializers] # #