diff options
author | Georg Brandl <georg@python.org> | 2013-10-27 08:54:53 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2013-10-27 08:54:53 (GMT) |
commit | 186729e81211ad04a2db523c3ac9e8e79aed3fd9 (patch) | |
tree | aed79a9b8f6c84dba56878a45d2c128bc68502ab /Doc/library/multiprocessing.rst | |
parent | fb404f528a1c0122f72ad4ab12cd5c26e5d13835 (diff) | |
parent | d2d6beaa69e6f9699925f9ad8a8630b0c1924c2b (diff) | |
download | cpython-186729e81211ad04a2db523c3ac9e8e79aed3fd9.zip cpython-186729e81211ad04a2db523c3ac9e8e79aed3fd9.tar.gz cpython-186729e81211ad04a2db523c3ac9e8e79aed3fd9.tar.bz2 |
merge with 3.3
Diffstat (limited to 'Doc/library/multiprocessing.rst')
-rw-r--r-- | Doc/library/multiprocessing.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index 6a72759..f3197eb 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -1974,7 +1974,7 @@ with the :class:`Pool` class. .. versionadded:: 3.3 Pool objects now support the context manager protocol -- see :ref:`typecontextmanager`. :meth:`~contextmanager.__enter__` returns the - pool object, and :meth:~contextmanager.`__exit__` calls :meth:`terminate`. + pool object, and :meth:`~contextmanager.__exit__` calls :meth:`terminate`. .. class:: AsyncResult @@ -2147,7 +2147,7 @@ multiple connections at the same time. .. versionadded:: 3.3 Listener objects now support the context manager protocol -- see :ref:`typecontextmanager`. :meth:`~contextmanager.__enter__` returns the - listener object, and :meth:~contextmanager.`__exit__` calls :meth:`close`. + listener object, and :meth:`~contextmanager.__exit__` calls :meth:`close`. .. function:: wait(object_list, timeout=None) |