diff options
| author | Richard Oudkerk <shibturn@gmail.com> | 2012-06-07 19:38:11 (GMT) |
|---|---|---|
| committer | Richard Oudkerk <shibturn@gmail.com> | 2012-06-07 19:38:11 (GMT) |
| commit | 58ba47f97b582269a71e0376d6d8da58807842c9 (patch) | |
| tree | 4492449f6cfb60c91ca3c677c379e91ebc04487c /Lib/multiprocessing | |
| parent | 74482201b8bfe76280fbc62c1b7eaa90120415e1 (diff) | |
| parent | 29471de459a9371d7538a9838b1b20c86df29ca7 (diff) | |
| download | cpython-58ba47f97b582269a71e0376d6d8da58807842c9.zip cpython-58ba47f97b582269a71e0376d6d8da58807842c9.tar.gz cpython-58ba47f97b582269a71e0376d6d8da58807842c9.tar.bz2 | |
Merge fixes for #13854 and #12157.
Diffstat (limited to 'Lib/multiprocessing')
| -rw-r--r-- | Lib/multiprocessing/pool.py | 1 | ||||
| -rw-r--r-- | Lib/multiprocessing/process.py | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py index 149e32a..7f5a7e3 100644 --- a/Lib/multiprocessing/pool.py +++ b/Lib/multiprocessing/pool.py @@ -576,6 +576,7 @@ class MapResult(ApplyResult): if chunksize <= 0: self._number_left = 0 self._event.set() + del cache[self._job] else: self._number_left = length//chunksize + bool(length % chunksize) diff --git a/Lib/multiprocessing/process.py b/Lib/multiprocessing/process.py index dc81ae6..893507b 100644 --- a/Lib/multiprocessing/process.py +++ b/Lib/multiprocessing/process.py @@ -262,11 +262,11 @@ class Process(object): except SystemExit as e: if not e.args: exitcode = 1 - elif type(e.args[0]) is int: + elif isinstance(e.args[0], int): exitcode = e.args[0] else: - sys.stderr.write(e.args[0] + '\n') - exitcode = 1 + sys.stderr.write(str(e.args[0]) + '\n') + exitcode = 0 if isinstance(e.args[0], str) else 1 except: exitcode = 1 import traceback |