[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5

[andrew.svetlov]

https://hg.python.org/cpython/rev/43e0c5d02dd2
changeset:   100782:43e0c5d02dd2
parent:      100780:9fdeca5fdbf0
parent:      100781:fabb5551c0c2
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Tue Mar 29 09:39:22 2016 +0300
summary:
  Merge 3.5

files:
  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
--- a/Doc/library/asyncio-task.rst
+++ b/Doc/library/asyncio-task.rst
@@ -675,6 +675,8 @@
       :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)
 

-- 
Repository URL: https://hg.python.org/cpython