[Python-checkins] cpython (2.7): Fix handling of SystemExit and exit code. Patch by Brodie Rao.

[richard.oudkerk]

http://hg.python.org/cpython/rev/0fa82a06194c
changeset:   87208:0fa82a06194c
branch:      2.7
parent:      87205:7aabbe919f55
user:        Richard Oudkerk <shibturn at gmail.com>
date:        Sun Nov 17 17:24:11 2013 +0000
summary:
  Fix handling of SystemExit and exit code.  Patch by Brodie Rao.

files:
  Lib/multiprocessing/process.py   |  2 +-
  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
--- a/Lib/multiprocessing/process.py
+++ b/Lib/multiprocessing/process.py
@@ -267,7 +267,7 @@
             else:
                 sys.stderr.write(str(e.args[0]) + '\n')
                 sys.stderr.flush()
-                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
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -339,7 +339,7 @@
         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()

-- 
Repository URL: http://hg.python.org/cpython