summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2016-03-29 06:39:02 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2016-03-29 06:39:02 (GMT)
commit6f57424ae07a8c7ecb171b4df2e0e2512f48d973 (patch)
tree8d69526fac7dc14c2f205bcbb71270feac9f9973 /Doc
parentf9cddccf8c165f461ace35302187ce32a3c38d7f (diff)
downloadcpython-6f57424ae07a8c7ecb171b4df2e0e2512f48d973.zip
cpython-6f57424ae07a8c7ecb171b4df2e0e2512f48d973.tar.gz
cpython-6f57424ae07a8c7ecb171b4df2e0e2512f48d973.tar.bz2
Document None as timeout for asyncio.timeout()
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/asyncio-task.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst
index fc73c20..6f56026 100644
--- a/Doc/library/asyncio-task.rst
+++ b/Doc/library/asyncio-task.rst
@@ -675,6 +675,8 @@ Task functions
:exc:`asyncio.TimeoutError` is raised outside of
context manager scope.
+ Passing ``None`` as *timeout* argument disables the manager logic.
+
.. coroutinefunction:: wait(futures, \*, loop=None, timeout=None,\
return_when=ALL_COMPLETED)