diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2017-06-12 08:25:04 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-12 08:25:04 +0300 |
| commit | 3fd54d4a7e604067e2bc0f8cfd58bdbdc09fa7f4 (patch) | |
| tree | a36010810577629101ec074cf56a5c9d307acda3 /Modules/atexitmodule.c | |
| parent | 1dbce04d0e3e93b715eb0d8024da396361759d16 (diff) | |
| download | cpython-git-3fd54d4a7e604067e2bc0f8cfd58bdbdc09fa7f4.tar.gz | |
bpo-28994: Fixed errors handling in atexit._run_exitfuncs(). (#2034)
The traceback no longer displayed for SystemExit raised in a callback registered by atexit.
Diffstat (limited to 'Modules/atexitmodule.c')
| -rw-r--r-- | Modules/atexitmodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/atexitmodule.c b/Modules/atexitmodule.c index 3cdf2d7e56..35ebf08ecd 100644 --- 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); |