[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4 (asyncio doc)
victor.stinner
python-checkins at python.org
Fri Apr 3 17:10:31 CEST 2015
https://hg.python.org/cpython/rev/17d9a526394f
changeset: 95415:17d9a526394f
parent: 95413:5795e7a85aee
parent: 95414:c167b9f9aac8
user: Victor Stinner <victor.stinner at gmail.com>
date: Fri Apr 03 17:10:17 2015 +0200
summary:
Merge 3.4 (asyncio doc)
files:
Doc/library/asyncio-task.rst | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst
--- a/Doc/library/asyncio-task.rst
+++ b/Doc/library/asyncio-task.rst
@@ -644,7 +644,12 @@
cancels the task and raises :exc:`asyncio.TimeoutError`. To avoid the task
cancellation, wrap it in :func:`shield`.
+ If the wait is cancelled, the future *fut* is also cancelled.
+
This function is a :ref:`coroutine <coroutine>`, usage::
result = yield from asyncio.wait_for(fut, 60.0)
+ .. versionchanged:: 3.4.3
+ If the wait is cancelled, the future *fut* is now also cancelled.
+
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list