summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing
diff options
context:
space:
mode:
authorHynek Schlawack <hs@ox.cx>2012-10-27 10:56:30 (GMT)
committerHynek Schlawack <hs@ox.cx>2012-10-27 10:56:30 (GMT)
commit969684f2ad340cdfe1c46ba5b40b6668aca1b52b (patch)
tree97126e9f978669f0353aabe298b3738db9ec1f20 /Lib/multiprocessing
parent5979fdf548677a8a6ecc45542f6df640c10d2096 (diff)
parent254af2644a90bcabbe2612950dd2a6ef408337be (diff)
downloadcpython-969684f2ad340cdfe1c46ba5b40b6668aca1b52b.zip
cpython-969684f2ad340cdfe1c46ba5b40b6668aca1b52b.tar.gz
cpython-969684f2ad340cdfe1c46ba5b40b6668aca1b52b.tar.bz2
Merge 3.3
Diffstat (limited to 'Lib/multiprocessing')
-rw-r--r--Lib/multiprocessing/pool.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py
index ec57939..7f73b44 100644
--- a/Lib/multiprocessing/pool.py
+++ b/Lib/multiprocessing/pool.py
@@ -297,7 +297,8 @@ class Pool(object):
'''
Asynchronous version of `map()` method.
'''
- return self._map_async(func, iterable, mapstar, chunksize)
+ return self._map_async(func, iterable, mapstar, chunksize, callback,
+ error_callback)
def _map_async(self, func, iterable, mapper, chunksize=None, callback=None,
error_callback=None):