Merge 3.5

97fb2eb3 · Andrew Svetlov · 6209bc7d · ea9b79fd · 97fb2eb3
Commit 97fb2eb3 authored Mar 29, 2016 by Andrew Svetlov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

Doc/library/asyncio-task.rst Doc/library/asyncio-task.rst +2 -0

No files found.
--- 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)