From: Victor Stinner <victor.stinner@gmail.com>
Date: Fri, 3 Apr 2015 15:08:19 +0000 (+0200)
Subject: Issue #23219: Update asyncio.wait_for() documentation
X-Git-Tag: v3.5.0a4~182^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72dcb0a7658c6dd99c2798b515c76e8cb311dbf6;p=thirdparty%2FPython%2Fcpython.git

Issue #23219: Update asyncio.wait_for() documentation

the wait is cancelled, the future *fut* is now also cancelled.
---

diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst
index 158a0d87842c..839296731809 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.
+