summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing/__init__.py
diff options
context:
space:
mode:
authorJesse Noller <jnoller@gmail.com>2010-01-27 03:36:01 (GMT)
committerJesse Noller <jnoller@gmail.com>2010-01-27 03:36:01 (GMT)
commit1f0b6586387a3dae59cf28239effe14f1333229a (patch)
tree5113af47512d196c433d6bcb695985bcbc21a14f /Lib/multiprocessing/__init__.py
parentc3511a461de4e7370415b7de85eb193b6ee1548a (diff)
downloadcpython-1f0b6586387a3dae59cf28239effe14f1333229a.zip
cpython-1f0b6586387a3dae59cf28239effe14f1333229a.tar.gz
cpython-1f0b6586387a3dae59cf28239effe14f1333229a.tar.bz2
Merged revisions 77794 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r77794 | jesse.noller | 2010-01-26 22:05:57 -0500 (Tue, 26 Jan 2010) | 1 line Issue #6963: Added maxtasksperchild argument to multiprocessing.Pool ........
Diffstat (limited to 'Lib/multiprocessing/__init__.py')
-rw-r--r--Lib/multiprocessing/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/multiprocessing/__init__.py b/Lib/multiprocessing/__init__.py
index 5a13742..e4af68b 100644
--- a/Lib/multiprocessing/__init__.py
+++ b/Lib/multiprocessing/__init__.py
@@ -218,12 +218,12 @@ def JoinableQueue(maxsize=0):
from multiprocessing.queues import JoinableQueue
return JoinableQueue(maxsize)
-def Pool(processes=None, initializer=None, initargs=()):
+def Pool(processes=None, initializer=None, initargs=(), maxtasksperchild=None):
'''
Returns a process pool object
'''
from multiprocessing.pool import Pool
- return Pool(processes, initializer, initargs)
+ return Pool(processes, initializer, initargs, maxtasksperchild)
def RawValue(typecode_or_type, *args):
'''