From 4d2b625589b9b81904641f2b033dca0c7e3a41e8 Mon Sep 17 00:00:00 2001 From: Ben Darnell Date: Sat, 22 Jun 2019 09:42:09 -0400 Subject: [PATCH] gen: Clean up docs for with_timeout Mark CancelledError change as 6.0.3 --- tornado/gen.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tornado/gen.py b/tornado/gen.py index daed58ae1..7cc7ec785 100644 --- a/tornado/gen.py +++ b/tornado/gen.py @@ -559,7 +559,7 @@ def with_timeout( If the wrapped `.Future` fails after it has timed out, the exception will be logged unless it is either of a type contained in ``quiet_exceptions`` (which may be an exception type or a sequence of - types), or a ``CancelledError``. + types), or an ``asyncio.CancelledError``. The wrapped `.Future` is not canceled when the timeout expires, permitting it to be reused. `asyncio.wait_for` is similar to this @@ -574,8 +574,8 @@ def with_timeout( .. versionchanged:: 4.4 Added support for yieldable objects other than `.Future`. - .. versionchanged:: 6.1 - Do not log CancelledError after timeout. + .. versionchanged:: 6.0.3 + ``asyncio.CancelledError`` is now always considered "quiet". """ # It's tempting to optimize this by cancelling the input future on timeout -- 2.47.2