mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge.

Browse source
This commit is contained in:
Richard Oudkerk 2013-11-17 17:30:54 +00:00
commit 69cce482cb
2 changed files with 2 additions and 2 deletions
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] exitcode = e.args[0]
else: else:
sys.stderr.write(str(e.args[0]) + '\n') sys.stderr.write(str(e.args[0]) + '\n')
exitcode = 0 if isinstance(e.args[0], str) else 1 exitcode = 1
except: except:
exitcode = 1 exitcode = 1
import traceback import traceback

2
Lib/test/_test_multiprocessing.py
View file

@ -474,7 +474,7 @@ class _TestSubclassingProcess(BaseTestCase):
testfn = test.support.TESTFN testfn = test.support.TESTFN
self.addCleanup(test.support.unlink, 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 = self.Process(target=self._test_sys_exit, args=(reason, testfn))
p.daemon = True p.daemon = True
p.start() p.start()