summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Curtin <brian@python.org>2014-02-09 00:36:57 (GMT)
committerBrian Curtin <brian@python.org>2014-02-09 00:36:57 (GMT)
commitc9d1a6b85eb9cb1ddd520cefc5f0c7a21a1b1e2c (patch)
tree98af81ff90224183ff059e5c5876734abc574e01
parenta1afeec9aa4039f5b03a6513b63847bdfecb4c4d (diff)
parent12c68b20b71f77f8bcfdf690b4246b7256b9b04a (diff)
downloadcpython-c9d1a6b85eb9cb1ddd520cefc5f0c7a21a1b1e2c.zip
cpython-c9d1a6b85eb9cb1ddd520cefc5f0c7a21a1b1e2c.tar.gz
cpython-c9d1a6b85eb9cb1ddd520cefc5f0c7a21a1b1e2c.tar.bz2
merge
-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 4b2753a..83d9742 100644
--- a/Doc/library/asyncio-task.rst
+++ b/Doc/library/asyncio-task.rst
@@ -415,7 +415,7 @@ Task functions
All futures must share the same event loop. If all the tasks are done
successfully, the returned future's result is the list of results (in the
order of the original sequence, not necessarily the order of results
- arrival). If *result_exception* is True, exceptions in the tasks are
+ arrival). If *return_exceptions* is True, exceptions in the tasks are
treated the same as successful results, and gathered in the result list;
otherwise, the first raised exception will be immediately propagated to the
returned future.