summaryrefslogtreecommitdiff
path: root/Lib/multiprocessing
diff options
context:
space:
mode:
authorRichard Oudkerk <shibturn@gmail.com>2013-11-17 17:30:54 +0000
committerRichard Oudkerk <shibturn@gmail.com>2013-11-17 17:30:54 +0000
commitdeae62df665a528898e13887a483bfdcba13a49c (patch)
tree17552faf7a92222b4f97522e26f908a0ebc300f5 /Lib/multiprocessing
parent38c4f79ca5076160b7f0b156969c6be5972cff0b (diff)
parent6957bb8549202ff9a20ad01c5888c00bd48279e0 (diff)
downloadcpython-deae62df665a528898e13887a483bfdcba13a49c.tar.gz
Merge.
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 cd52736a70..68959bf9f4 100644
--- a/Lib/multiprocessing/process.py
+++ b/Lib/multiprocessing/process.py
@@ -262,7 +262,7 @@ class BaseProcess(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