bpo-35727: Use exit code 0 on sys.exit() in multiprocessing.Process. (GH-11538)
diff --git a/Lib/multiprocessing/process.py b/Lib/multiprocessing/process.py
index be13c07..0b2e0b4 100644
--- a/Lib/multiprocessing/process.py
+++ b/Lib/multiprocessing/process.py
@@ -317,12 +317,12 @@
finally:
util._exit_function()
except SystemExit as e:
- if not e.args:
- exitcode = 1
- elif isinstance(e.args[0], int):
- exitcode = e.args[0]
+ if e.code is None:
+ exitcode = 0
+ elif isinstance(e.code, int):
+ exitcode = e.code
else:
- sys.stderr.write(str(e.args[0]) + '\n')
+ sys.stderr.write(str(e.code) + '\n')
exitcode = 1
except:
exitcode = 1
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index 4e48cd4..73dc75d 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -864,12 +864,21 @@
os.unlink(testfn)
- for reason in (True, False, 8):
- p = self.Process(target=sys.exit, args=(reason,))
- p.daemon = True
- p.start()
- join_process(p)
- self.assertEqual(p.exitcode, reason)
+ cases = [
+ ((True,), 1),
+ ((False,), 0),
+ ((8,), 8),
+ ((None,), 0),
+ ((), 0),
+ ]
+
+ for args, expected in cases:
+ with self.subTest(args=args):
+ p = self.Process(target=sys.exit, args=args)
+ p.daemon = True
+ p.start()
+ join_process(p)
+ self.assertEqual(p.exitcode, expected)
#
#