diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-04-03 15:10:17 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-04-03 15:10:17 (GMT) |
| commit | 32ed7509523517a3737e45123609048c75440591 (patch) | |
| tree | 67e5e22acac9746c299b546cc1dce5b55252ccb1 /Doc | |
| parent | a8cd4d482f2f0e5954ee39abdc191cb2ab1cb4ce (diff) | |
| parent | 72dcb0a7658c6dd99c2798b515c76e8cb311dbf6 (diff) | |
| download | cpython-32ed7509523517a3737e45123609048c75440591.zip cpython-32ed7509523517a3737e45123609048c75440591.tar.gz cpython-32ed7509523517a3737e45123609048c75440591.tar.bz2 | |
Merge 3.4 (asyncio doc)
Diffstat (limited to 'Doc')
| -rw-r--r-- | 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 index 158a0d8..8392967 100644 --- a/Doc/library/asyncio-task.rst +++ b/Doc/library/asyncio-task.rst @@ -644,7 +644,12 @@ Task functions 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. + |