Issue #18776: atexit callbacks now display their full traceback when they raise an exception.

1 files changed, 10 insertions, 0 deletions

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index c2ca563d1a..06f30b0f40 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1919,6 +1919,16 @@ PyErr_Display(PyObject *exception, PyObject *value, PyObject *tb)
 {
     PyObject *seen;
     PyObject *f = PySys_GetObject("stderr");
+    if (PyExceptionInstance_Check(value)
+        && tb != NULL && PyTraceBack_Check(tb)) {
+        /* Put the traceback on the exception, otherwise it won't get
+           displayed.  See issue #18776. */
+        PyObject *cur_tb = PyException_GetTraceback(value);
+        if (cur_tb == NULL)
+            PyException_SetTraceback(value, tb);
+        else
+            Py_DECREF(cur_tb);
+    }
     if (f == Py_None) {
         /* pass */
     }