Mercurial > cpython-lru_cache-weakref

diff Lib/multiprocessing/process.py @ 77375:4346cba353b4 3.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Issue #13854: Properly handle non-integer, non-string arg to SystemExit Previously multiprocessing only expected int or str. It also wrongly used an exit code of 1 when the argument was a string instead of zero.
author Richard Oudkerk <shibturn@gmail.com>
date Wed, 06 Jun 2012 19:04:57 +0100
parents 2863d9273abd
children 3585cb1388f2
line wrap: on
line diff
--- a/Lib/multiprocessing/process.py	Wed Jun 06 19:04:57 2012 +0100
+++ b/Lib/multiprocessing/process.py	Wed Jun 06 19:04:57 2012 +0100
@@ -271,11 +271,11 @@
         except SystemExit as e:
             if not e.args:
                 exitcode = 1
-            elif type(e.args[0]) is int:
+            elif isinstance(e.args[0], int):
                 exitcode = e.args[0]
             else:
-                sys.stderr.write(e.args[0] + '\n')
-                exitcode = 1
+                sys.stderr.write(str(e.args[0]) + '\n')
+                exitcode = 0 if isinstance(e.args[0], str) else 1
         except:
             exitcode = 1
             import traceback