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

[andrew.svetlov]

https://hg.python.org/cpython/rev/d86eabe2c457
changeset:   102563:d86eabe2c457
parent:      102561:1002a1bdc5b1
parent:      102562:59c9b99f545e
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Mon Aug 08 03:11:06 2016 +0300
summary:
  Merge 3.5

files:
  Doc/library/asyncio-task.rst |  2 +-
  1 files changed, 1 insertions(+), 1 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
@@ -486,7 +486,7 @@
         asyncio.ensure_future(factorial("A", 2)),
         asyncio.ensure_future(factorial("B", 3)),
         asyncio.ensure_future(factorial("C", 4))]
-    loop.run_until_complete(asyncio.wait(tasks))
+    loop.run_until_complete(asyncio.gather(*tasks))
     loop.close()
 
 Output::

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