Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge 3.5

This commit is contained in:
Andrew Svetlov 2016-03-29 09:39:22 +03:00
parent eba25880f8 6f57424ae0
commit 50e648a06d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/library/asyncio-task.rst
View File

@ -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)