[3.6] bpo-28994: Fixed errors handling in atexit._run_exitfuncs(). (GH-2034) (#2121)

serhiy-storchaka · web-flow · commit d89dc844d288 · 2017-06-12T09:02:13.000+03:00
The traceback no longer displayed for SystemExit raised in a callback registered by atexit.. (cherry picked from commit 3fd54d4)
diff --git a/Lib/test/test_atexit.py b/Lib/test/test_atexit.py
@@ -23,6 +23,9 @@ def raise1():
 def raise2():
     raise SystemError
 
+def exit():
+    raise SystemExit
+
 
 class GeneralTest(unittest.TestCase):
 
@@ -76,6 +79,13 @@ def test_raise_unnormalized(self):
         self.assertRaises(ZeroDivisionError, atexit._run_exitfuncs)
         self.assertIn("ZeroDivisionError", self.stream.getvalue())
 
+    def test_exit(self):
+        # be sure a SystemExit is handled properly
+        atexit.register(exit)
+
+        self.assertRaises(SystemExit, atexit._run_exitfuncs)
+        self.assertEqual(self.stream.getvalue(), '')
+
     def test_print_tracebacks(self):
         # Issue #18776: the tracebacks should be printed when errors occur.
         def f():
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -49,6 +49,9 @@ Core and Builtins
 Library
 -------
 
+- bpo-28994: The traceback no longer displayed for SystemExit raised in
+  a callback registered by atexit.
+
 - bpo-30508: Don't log exceptions if Task/Future "cancel()" method was
   called.
 
diff --git a/Modules/atexitmodule.c b/Modules/atexitmodule.c
@@ -97,7 +97,7 @@ atexit_callfuncs(void)
                 Py_XDECREF(exc_tb);
             }
             PyErr_Fetch(&exc_type, &exc_value, &exc_tb);
-            if (!PyErr_ExceptionMatches(PyExc_SystemExit)) {
+            if (!PyErr_GivenExceptionMatches(exc_type, PyExc_SystemExit)) {
                 PySys_WriteStderr("Error in atexit._run_exitfuncs:\n");
                 PyErr_NormalizeException(&exc_type, &exc_value, &exc_tb);
                 PyErr_Display(exc_type, exc_value, exc_tb);

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ atexit_callfuncs(void)`
`97`	`97`	`Py_XDECREF(exc_tb);`
`98`	`98`	`}`
`99`	`99`	`PyErr_Fetch(&exc_type, &exc_value, &exc_tb);`
`100`		`- if (!PyErr_ExceptionMatches(PyExc_SystemExit)) {`
	`100`	`+ if (!PyErr_GivenExceptionMatches(exc_type, PyExc_SystemExit)) {`
`101`	`101`	`PySys_WriteStderr("Error in atexit._run_exitfuncs:\n");`
`102`	`102`	`PyErr_NormalizeException(&exc_type, &exc_value, &exc_tb);`
`103`	`103`	`PyErr_Display(exc_type, exc_value, exc_tb);`