diff options
| author | Richard Oudkerk <shibturn@gmail.com> | 2013-11-17 17:30:54 (GMT) |
|---|---|---|
| committer | Richard Oudkerk <shibturn@gmail.com> | 2013-11-17 17:30:54 (GMT) |
| commit | 69cce482cb9e62341dcc3c72515f43bdca762b7b (patch) | |
| tree | 979298672436db01b3cfd18d6f413e0bd6c7b2eb | |
| parent | cfac5181ed4871baa0902f6d04000c6d56427749 (diff) | |
| parent | 8731d7b3c69beb226562c5fc2b382af9249fec5c (diff) | |
| download | cpython-69cce482cb9e62341dcc3c72515f43bdca762b7b.zip cpython-69cce482cb9e62341dcc3c72515f43bdca762b7b.tar.gz cpython-69cce482cb9e62341dcc3c72515f43bdca762b7b.tar.bz2 | |
Merge.
| -rw-r--r-- | Lib/multiprocessing/process.py | 2 | ||||
| -rw-r--r-- | Lib/test/_test_multiprocessing.py | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py index ad77260..183e86f 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -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() |