mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-28 19:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge 3.5

Browse source
This commit is contained in:
Andrew Svetlov 2016-03-29 09:39:22 +03:00
commit 50e648a06d
1 changed files with 2 additions and 0 deletions
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 :exc:`asyncio.TimeoutError` is raised outside of
context manager scope. context manager scope.
Passing ``None`` as *timeout* argument disables the manager logic.
.. coroutinefunction:: wait(futures, \*, loop=None, timeout=None,\ .. coroutinefunction:: wait(futures, \*, loop=None, timeout=None,\
return_when=ALL_COMPLETED) return_when=ALL_COMPLETED)