traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge.

This commit is contained in:
Richard Oudkerk 2013-11-17 17:30:54 +00:00
parent cfac5181ed 8731d7b3c6
commit 69cce482cb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/multiprocessing/process.py
View File

@ -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

2
Lib/test/_test_multiprocessing.py
View File

@ -474,7 +474,7 @@ class _TestSubclassingProcess(BaseTestCase):
testfn = test.support.TESTFN
self.addCleanup(test.support.unlink, testfn)
for reason, code in (([1, 2, 3], 1), ('ignore this', 0)):
for reason, code in (([1, 2, 3], 1), ('ignore this', 1)):
p = self.Process(target=self._test_sys_exit, args=(reason, testfn))
p.daemon = True
p.start()