diff options
author | Georg Brandl <georg@python.org> | 2013-10-27 09:54:53 +0100 |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2013-10-27 09:54:53 +0100 |
commit | 186729e81211ad04a2db523c3ac9e8e79aed3fd9 (patch) | |
tree | aed79a9b8f6c84dba56878a45d2c128bc68502ab /Doc/library/multiprocessing.rst | |
parent | #19227: merge with 3.3 (diff) | |
parent | Added tag v3.3.3rc1 for changeset fd53c500f8b8 (diff) | |
download | cpython-186729e81211ad04a2db523c3ac9e8e79aed3fd9.tar.gz cpython-186729e81211ad04a2db523c3ac9e8e79aed3fd9.tar.bz2 cpython-186729e81211ad04a2db523c3ac9e8e79aed3fd9.zip |
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 6a727590901..f3197ebae65 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) |