diff options
| author | Richard Oudkerk <shibturn@gmail.com> | 2012-06-06 18:01:14 (GMT) |
|---|---|---|
| committer | Richard Oudkerk <shibturn@gmail.com> | 2012-06-06 18:01:14 (GMT) |
| commit | 2182e0578c21d9a89cb507300b5f2c5319dced93 (patch) | |
| tree | 3f17161c79bc624a346e80c1ce5efcc7ccbfbc89 /Lib/multiprocessing | |
| parent | d44a4a27a6968558c3a78dbf2578ac7dcbd2ee08 (diff) | |
| download | cpython-2182e0578c21d9a89cb507300b5f2c5319dced93.zip cpython-2182e0578c21d9a89cb507300b5f2c5319dced93.tar.gz cpython-2182e0578c21d9a89cb507300b5f2c5319dced93.tar.bz2 | |
Issue #13854: Properly handle non-integer, non-string arg to SystemExit
Previously multiprocessing only expected int or str. It also wrongly
used an exit code of 1 when the argument was a string instead of zero.
Diffstat (limited to 'Lib/multiprocessing')
| -rw-r--r-- | Lib/multiprocessing/process.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/multiprocessing/process.py b/Lib/multiprocessing/process.py index 0697e74..482ea0a 100644 --- a/Lib/multiprocessing/process.py +++ b/Lib/multiprocessing/process.py @@ -262,12 +262,12 @@ class Process(object): except SystemExit, 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') + sys.stderr.write(str(e.args[0]) + '\n') sys.stderr.flush() - exitcode = 1 + exitcode = 0 if isinstance(e.args[0], str) else 1 except: exitcode = 1 import traceback |