summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing/process.py
diff options
context:
space:
mode:
authorChristopher Hunt <chrahunt@gmail.com>2020-02-21 09:33:04 (GMT)
committerGitHub <noreply@github.com>2020-02-21 09:33:04 (GMT)
commitc2ac4cf040ea950bf552d1e77bea613a1a5474fe (patch)
tree00d33e24b2e69458a109f64e66bd1b619bb219f5 /Lib/multiprocessing/process.py
parentbaf29b221682be0f4fde53a05ea3f57c3c79f431 (diff)
downloadcpython-c2ac4cf040ea950bf552d1e77bea613a1a5474fe.zip
cpython-c2ac4cf040ea950bf552d1e77bea613a1a5474fe.tar.gz
cpython-c2ac4cf040ea950bf552d1e77bea613a1a5474fe.tar.bz2
bpo-35727: Use exit code 0 on sys.exit() in multiprocessing.Process. (GH-11538)
Diffstat (limited to 'Lib/multiprocessing/process.py')
-rw-r--r--Lib/multiprocessing/process.py10
1 files changed, 5 insertions, 5 deletions
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 @@ class BaseProcess(object):
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