summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2016-08-08 00:11:06 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2016-08-08 00:11:06 (GMT)
commit2b1c45ed543d1765ea9e42e4a9b835914ecce3ad (patch)
treeb01d62ba4e7738d2e5a4b041535de618739da714
parent50abe877ee6f50ebd9cfe228d314220e071fa3c6 (diff)
parent4365b8302db6e100e3ad4bddf891c8a4e747c5c1 (diff)
downloadcpython-2b1c45ed543d1765ea9e42e4a9b835914ecce3ad.zip
cpython-2b1c45ed543d1765ea9e42e4a9b835914ecce3ad.tar.gz
cpython-2b1c45ed543d1765ea9e42e4a9b835914ecce3ad.tar.bz2
Merge 3.5
-rw-r--r--Doc/library/asyncio-task.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst
index de6ee58..c6c77be 100644
--- a/Doc/library/asyncio-task.rst
+++ b/Doc/library/asyncio-task.rst
@@ -486,7 +486,7 @@ Example executing 3 tasks (A, B, C) in parallel::
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::