[Python-checkins] bpo-44472: Fix ltrace functionality when exceptions are raised (GH-26822) (#26831)
ambv
webhook-mailer at python.org
Mon Jul 12 11:11:15 EDT 2021
https://github.com/python/cpython/commit/6fb4248cd9502f50dd089fdcf548d735dcfd981e
commit: 6fb4248cd9502f50dd089fdcf548d735dcfd981e
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-07-12T17:11:10+02:00
summary:
bpo-44472: Fix ltrace functionality when exceptions are raised (GH-26822) (#26831)
(cherry picked from commit 06cda808f149fae9b4c688f752b6eccd0d455ba4)
Co-authored-by: Pablo Galindo <Pablogsal at gmail.com>
files:
A Misc/NEWS.d/next/Core and Builtins/2021-06-21-11-19-54.bpo-44472.Vvm1yn.rst
M Python/ceval.c
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-06-21-11-19-54.bpo-44472.Vvm1yn.rst b/Misc/NEWS.d/next/Core and Builtins/2021-06-21-11-19-54.bpo-44472.Vvm1yn.rst
new file mode 100644
index 00000000000000..34fa2a9e8615fa
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-06-21-11-19-54.bpo-44472.Vvm1yn.rst
@@ -0,0 +1 @@
+Fix ltrace functionality when exceptions are raised. Patch by Pablo Galindo
diff --git a/Python/ceval.c b/Python/ceval.c
index 91e879e8042044..86a5d81b7669ac 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4598,11 +4598,14 @@ static int
prtrace(PyThreadState *tstate, PyObject *v, const char *str)
{
printf("%s ", str);
+ PyObject *type, *value, *traceback;
+ PyErr_Fetch(&type, &value, &traceback);
if (PyObject_Print(v, stdout, 0) != 0) {
/* Don't know what else to do */
_PyErr_Clear(tstate);
}
printf("\n");
+ PyErr_Restore(type, value, traceback);
return 1;
}
#endif
More information about the Python-checkins
mailing list