diff options
| author | Andrew Svetlov <andrew.svetlov@gmail.com> | 2016-03-29 09:39:22 +0300 |
|---|---|---|
| committer | Andrew Svetlov <andrew.svetlov@gmail.com> | 2016-03-29 09:39:22 +0300 |
| commit | 50e648a06db7f4858e5f99f8490b86423befba60 (patch) | |
| tree | 73ad289a5b7c32b43fd0072c66499ef93e2ccc0a | |
| parent | eba25880f8f83d8153135558d5df2dec36e3d784 (diff) | |
| parent | 6f57424ae07a8c7ecb171b4df2e0e2512f48d973 (diff) | |
| download | cpython-git-50e648a06db7f4858e5f99f8490b86423befba60.tar.gz | |
Merge 3.5
| -rw-r--r-- | Doc/library/asyncio-task.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst index fc73c2069c..6f56026db4 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) |