(original) (raw)

changeset: 77511:198382b4bcd0 user: Richard Oudkerk shibturn@gmail.com date: Mon Jun 18 21:29:30 2012 +0100 files: Doc/library/multiprocessing.rst Lib/multiprocessing/managers.py Lib/test/test_multiprocessing.py description: Issue #15064: Make BaseManager.__enter__() start server if necessary. diff -r 360f9d483f94 -r 198382b4bcd0 Doc/library/multiprocessing.rst --- a/Doc/library/multiprocessing.rst Mon Jun 18 19:57:23 2012 +0200 +++ b/Doc/library/multiprocessing.rst Mon Jun 18 21:29:30 2012 +0100 @@ -1281,9 +1281,14 @@ The address used by the manager. - Manager objects support the context manager protocol -- see - :ref:`typecontextmanager`. :meth:`__enter__` returns the - manager object, and :meth:`__exit__` calls :meth:`shutdown`. + .. versionchanged:: 3.3 + Manager objects support the context manager protocol -- see + :ref:`typecontextmanager`. :meth:`__enter__` starts the server + process (if it has not already started) and then returns the + manager object. :meth:`__exit__` calls :meth:`shutdown`. + + In previous versions :meth:`__enter__` did not start the + manager's server process if it was not already started. .. class:: SyncManager diff -r 360f9d483f94 -r 198382b4bcd0 Lib/multiprocessing/managers.py --- a/Lib/multiprocessing/managers.py Mon Jun 18 19:57:23 2012 +0200 +++ b/Lib/multiprocessing/managers.py Mon Jun 18 21:29:30 2012 +0100 @@ -561,6 +561,9 @@ conn.close() def __enter__(self): + if self._state.value == State.INITIAL: + self.start() + assert self._state.value == State.STARTED return self def __exit__(self, exc_type, exc_val, exc_tb): diff -r 360f9d483f94 -r 198382b4bcd0 Lib/test/test_multiprocessing.py --- a/Lib/test/test_multiprocessing.py Mon Jun 18 19:57:23 2012 +0200 +++ b/Lib/test/test_multiprocessing.py Mon Jun 18 21:29:30 2012 +0100 @@ -1888,7 +1888,27 @@ def test_mymanager(self): manager = MyManager() manager.start() - + self.common(manager) + manager.shutdown() + + # If the manager process exited cleanly then the exitcode + # will be zero. Otherwise (after a short timeout) + # terminate() is used, resulting in an exitcode of -SIGTERM. + self.assertEqual(manager._process.exitcode, 0) + + def test_mymanager_context(self): + with MyManager() as manager: + self.common(manager) + self.assertEqual(manager._process.exitcode, 0) + + def test_mymanager_context_prestarted(self): + manager = MyManager() + manager.start() + with manager: + self.common(manager) + self.assertEqual(manager._process.exitcode, 0) + + def common(self, manager): foo = manager.Foo() bar = manager.Bar() baz = manager.baz() @@ -1911,12 +1931,6 @@ self.assertEqual(list(baz), [i*i for i in range(10)]) - manager.shutdown() - - # If the manager process exited cleanly then the exitcode - # will be zero. Otherwise (after a short timeout) - # terminate() is used, resulting in an exitcode of -SIGTERM. - self.assertEqual(manager._process.exitcode, 0) # # Test of connecting to a remote server and using xmlrpclib for serialization /shibturn@gmail.com