From: Richard Oudkerk Date: Wed, 6 Jun 2012 18:04:57 +0000 (+0100) Subject: Issue #13854: Properly handle non-integer, non-string arg to SystemExit X-Git-Tag: v3.3.0b1~259^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29471de459a9371d7538a9838b1b20c86df29ca7;p=python 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. --- 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 diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py index 0d98a1498c..b812e4840b 100644 --- a/Lib/test/test_multiprocessing.py +++ b/Lib/test/test_multiprocessing.py @@ -390,6 +390,36 @@ class _TestSubclassingProcess(BaseTestCase): 1/0 # MARKER + @classmethod + def _test_sys_exit(cls, reason, testfn): + sys.stderr = open(testfn, 'w') + sys.exit(reason) + + def test_sys_exit(self): + # See Issue 13854 + if self.TYPE == 'threads': + return + + testfn = test.support.TESTFN + self.addCleanup(test.support.unlink, testfn) + + for reason, code in (([1, 2, 3], 1), ('ignore this', 0)): + p = self.Process(target=self._test_sys_exit, args=(reason, testfn)) + p.daemon = True + p.start() + p.join(5) + self.assertEqual(p.exitcode, code) + + with open(testfn, 'r') as f: + self.assertEqual(f.read().rstrip(), str(reason)) + + for reason in (True, False, 8): + p = self.Process(target=sys.exit, args=(reason,)) + p.daemon = True + p.start() + p.join(5) + self.assertEqual(p.exitcode, reason) + # # # diff --git a/Misc/NEWS b/Misc/NEWS index 071e962690..3f5c867a39 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -70,6 +70,9 @@ Core and Builtins Library ------- +- Issue #13854: Make multiprocessing properly handle non-integer + non-string argument to SystemExit. + - Issue #12157: Make pool.map() empty iterables correctly. Initial patch by mouad.