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 0697e74..482ea0a 100644
--- a/Lib/multiprocessing/process.py
+++ b/Lib/multiprocessing/process.py
@@ -262,12 +262,12 @@
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
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 42b2d91..3937dc7 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -325,6 +325,36 @@
]
self.assertEqual(result, expected)
+ @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 b832384..6d75b07 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -67,6 +67,9 @@
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.