mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merge fixes for #13854 and #12157.

Browse source
This commit is contained in:
Richard Oudkerk 2012-06-07 20:38:11 +01:00
commit 58ba47f97b
4 changed files with 55 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/multiprocessing/process.py
View file

@ -262,11 +262,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