summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing/process.py
diff options
context:
space:
mode:
authorRichard Oudkerk <shibturn@gmail.com>2013-11-17 17:30:54 (GMT)
committerRichard Oudkerk <shibturn@gmail.com>2013-11-17 17:30:54 (GMT)
commit69cce482cb9e62341dcc3c72515f43bdca762b7b (patch)
tree979298672436db01b3cfd18d6f413e0bd6c7b2eb /Lib/multiprocessing/process.py
parentcfac5181ed4871baa0902f6d04000c6d56427749 (diff)
parent8731d7b3c69beb226562c5fc2b382af9249fec5c (diff)
downloadcpython-69cce482cb9e62341dcc3c72515f43bdca762b7b.zip
cpython-69cce482cb9e62341dcc3c72515f43bdca762b7b.tar.gz
cpython-69cce482cb9e62341dcc3c72515f43bdca762b7b.tar.bz2
Merge.
Diffstat (limited to 'Lib/multiprocessing/process.py')
-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 cd52736..68959bf 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