[Python-checkins] cpython (merge 3.6 -> default): Issue #28410: Keep the traceback of original exception in

[serhiy.storchaka]

https://hg.python.org/cpython/rev/e853492da42c
changeset:   104607:e853492da42c
parent:      104604:6f1602dfa4d5
parent:      104606:23a1d9ec35d5
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Fri Oct 21 16:21:02 2016 +0300
summary:
  Issue #28410: Keep the traceback of original exception in _PyErr_ChainExceptions().

files:
  Python/errors.c |  5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Python/errors.c b/Python/errors.c
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -387,8 +387,11 @@
         PyObject *exc2, *val2, *tb2;
         PyErr_Fetch(&exc2, &val2, &tb2);
         PyErr_NormalizeException(&exc, &val, &tb);
+        if (tb != NULL) {
+            PyException_SetTraceback(val, tb);
+            Py_DECREF(tb);
+        }
         Py_DECREF(exc);
-        Py_XDECREF(tb);
         PyErr_NormalizeException(&exc2, &val2, &tb2);
         PyException_SetContext(val2, val);
         PyErr_Restore(exc2, val2, tb2);

-- 
Repository URL: https://hg.python.org/cpython