summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing/process.py
diff options
context:
space:
mode:
authorRichard Oudkerk <shibturn@gmail.com>2012-06-06 18:04:57 (GMT)
committerRichard Oudkerk <shibturn@gmail.com>2012-06-06 18:04:57 (GMT)
commit29471de459a9371d7538a9838b1b20c86df29ca7 (patch)
tree1c63299219f02f10b5e1cf94c1a67a9cde8492d5 /Lib/multiprocessing/process.py
parente41682b9945091c2e4b95a3f6a4582944fd7598e (diff)
downloadcpython-29471de459a9371d7538a9838b1b20c86df29ca7.zip
cpython-29471de459a9371d7538a9838b1b20c86df29ca7.tar.gz
cpython-29471de459a9371d7538a9838b1b20c86df29ca7.tar.bz2
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.
Diffstat (limited to 'Lib/multiprocessing/process.py')
-rw-r--r--Lib/multiprocessing/process.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/multiprocessing/process.py b/Lib/multiprocessing/process.py
index 2b61ee9..3262b50 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