Issue #14376: sys.exit now accepts longs as well as ints. Thanks Gareth Rees.

mdickinson · mdickinson · commit ea82972ec887 · 2017-02-02T19:31:53.000Z
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
@@ -164,6 +164,17 @@ def test_exit(self):
         self.assertEqual(out, b'')
         self.assertEqual(err, b'')
 
+        # test that the exit machinery handles long exit codes
+        rc, out, err = assert_python_failure('-c', 'raise SystemExit(47L)')
+        self.assertEqual(rc, 47)
+        self.assertEqual(out, b'')
+        self.assertEqual(err, b'')
+
+        rc, out, err = assert_python_ok('-c', 'raise SystemExit(0L)')
+        self.assertEqual(rc, 0)
+        self.assertEqual(out, b'')
+        self.assertEqual(err, b'')
+
         def check_exit_message(code, expected, **env_vars):
             rc, out, err = assert_python_failure('-c', code, **env_vars)
             self.assertEqual(rc, 1)
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 2.7.14?
 Core and Builtins
 -----------------
 
+- Issue #14376: Allow sys.exit to accept longs as well as ints. Patch
+  by Gareth Rees.
+
 - Issue #29028: Fixed possible use-after-free bugs in the subscription of the
   buffer object with custom index object.
 
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -1127,7 +1127,7 @@ handle_system_exit(void)
         /* If we failed to dig out the 'code' attribute,
            just let the else clause below print the error. */
     }
-    if (PyInt_Check(value))
+    if (PyInt_Check(value) || PyLong_Check(value))
         exitcode = (int)PyInt_AsLong(value);
     else {
         PyObject *sys_stderr = PySys_GetObject("stderr");

Original file line number	Diff line number	Diff line change
`@@ -1127,7 +1127,7 @@ handle_system_exit(void)`
`1127`	`1127`	`/* If we failed to dig out the 'code' attribute,`
`1128`	`1128`	`just let the else clause below print the error. */`
`1129`	`1129`	`}`
`1130`		`- if (PyInt_Check(value))`
	`1130`	`+ if (PyInt_Check(value) \|\| PyLong_Check(value))`
`1131`	`1131`	`exitcode = (int)PyInt_AsLong(value);`
`1132`	`1132`	`else {`
`1133`	`1133`	`PyObject *sys_stderr = PySys_GetObject("stderr");`