summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2011-08-08 14:38:47 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2011-08-08 14:38:47 (GMT)
commit1a41a4114c7395389270d34ed302da2300f2060e (patch)
tree6a2de1f5eb42f06b3c2b14566ee4ce3b5c3ff41d
parent1e8d8fd01d934fc610a6d37384f7e7718b1682f0 (diff)
parentdb79e951958fe901c0c7cf97914dfdb246abc0c3 (diff)
downloadcpython-1a41a4114c7395389270d34ed302da2300f2060e.zip
cpython-1a41a4114c7395389270d34ed302da2300f2060e.tar.gz
cpython-1a41a4114c7395389270d34ed302da2300f2060e.tar.bz2
#12709: merge with 3.2
-rw-r--r--Doc/library/multiprocessing.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index c534adf..7c5ce05 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -1628,7 +1628,7 @@ with the :class:`Pool` class.
the process pool as separate tasks. The (approximate) size of these
chunks can be specified by setting *chunksize* to a positive integer.
- .. method:: map_async(func, iterable[, chunksize[, callback]])
+ .. method:: map_async(func, iterable[, chunksize[, callback[, error_callback]]])
A variant of the :meth:`.map` method which returns a result object.