From 29471de459a9371d7538a9838b1b20c86df29ca7 Mon Sep 17 00:00:00 2001 From: Richard Oudkerk Date: Wed, 6 Jun 2012 19:04:57 +0100 Subject: 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. --- Lib/multiprocessing/process.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Lib/multiprocessing/process.py') diff --git a/Lib/multiprocessing/process.py b/Lib/multiprocessing/process.py index 2b61ee9a0d..3262b50f50 100644 --- a/Lib/multiprocessing/process.py +++ b/Lib/multiprocessing/process.py @@ -271,11 +271,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 -- cgit v1.2.1