summaryrefslogtreecommitdiff
path: root/Lib/multiprocessing
diff options
context:
space:
mode:
authorRichard Oudkerk <shibturn@gmail.com>2013-11-17 17:24:11 +0000
committerRichard Oudkerk <shibturn@gmail.com>2013-11-17 17:24:11 +0000
commit8731d7b3c69beb226562c5fc2b382af9249fec5c (patch)
tree21f62074d340aaa694c09ffcb4a3846dc3459708 /Lib/multiprocessing
parentedcf8daaed24f1031b95a29aeef33f3b10c39571 (diff)
downloadcpython-git-8731d7b3c69beb226562c5fc2b382af9249fec5c.tar.gz
Fix handling of SystemExit and exit code. Patch by Brodie Rao.
Diffstat (limited to 'Lib/multiprocessing')
-rw-r--r--Lib/multiprocessing/process.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/multiprocessing/process.py b/Lib/multiprocessing/process.py
index 893507bcd5..3d32add71a 100644
--- a/Lib/multiprocessing/process.py
+++ b/Lib/multiprocessing/process.py
@@ -266,7 +266,7 @@ class Process(object):
exitcode = e.args[0]
else:
sys.stderr.write(str(e.args[0]) + '\n')
- exitcode = 0 if isinstance(e.args[0], str) else 1
+ exitcode = 1
except:
exitcode = 1
import traceback