[Python-checkins] cpython (merge 3.2 -> default): #12709: merge with 3.2

[sandro.tosi]

http://hg.python.org/cpython/rev/0c922e7d26e1
changeset:   71773:0c922e7d26e1
parent:      71770:6adfeec8c482
parent:      71772:41b816853819
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Mon Aug 08 16:38:47 2011 +0200
summary:
  #12709: merge with 3.2

files:
  Doc/library/multiprocessing.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -1628,7 +1628,7 @@
       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.
 

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