[Python-checkins] cpython (merge 3.4 -> 3.5): Merge 3.4 (issue #24509)
yury.selivanov
python-checkins at python.org
Thu Jun 25 19:50:51 CEST 2015
https://hg.python.org/cpython/rev/fc69dd6aea55
changeset: 96676:fc69dd6aea55
branch: 3.5
parent: 96673:ed9bd661f627
parent: 96675:3199ec504dbe
user: Yury Selivanov <yselivanov at sprymix.com>
date: Thu Jun 25 13:50:21 2015 -0400
summary:
Merge 3.4 (issue #24509)
files:
Doc/library/asyncio-eventloop.rst | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst
--- a/Doc/library/asyncio-eventloop.rst
+++ b/Doc/library/asyncio-eventloop.rst
@@ -97,7 +97,8 @@
Any positional arguments after the callback will be passed to the
callback when it is called.
- An instance of :class:`asyncio.Handle` is returned.
+ An instance of :class:`asyncio.Handle` is returned, which can be
+ used to cancel the callback.
:ref:`Use functools.partial to pass keywords to the callback
<asyncio-pass-keywords>`.
@@ -130,7 +131,8 @@
Arrange for the *callback* to be called after the given *delay*
seconds (either an int or float).
- An instance of :class:`asyncio.Handle` is returned.
+ An instance of :class:`asyncio.Handle` is returned, which can be
+ used to cancel the callback.
*callback* will be called exactly once per call to :meth:`call_later`.
If two callbacks are scheduled for exactly the same time, it is
@@ -151,6 +153,9 @@
This method's behavior is the same as :meth:`call_later`.
+ An instance of :class:`asyncio.Handle` is returned, which can be
+ used to cancel the callback.
+
:ref:`Use functools.partial to pass keywords to the callback
<asyncio-pass-keywords>`.
@@ -704,7 +709,8 @@
.. method:: cancel()
- Cancel the call.
+ Cancel the call. If the callback is already canceled or executed,
+ this method has no effect.
Event loop examples
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list