bpo-28994: Fixed errors handling in atexit._run_exitfuncs().

serhiy-storchaka · serhiy-storchaka · commit 9f2f946829fc · 2017-06-11T14:24:27.000+03:00
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);`