diff options
| author | Mark Shannon <mark@hotpy.org> | 2023-02-08 09:31:12 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-08 09:31:12 (GMT) |
| commit | feec49c40736fc05626a183a8d14c4ebbea5ae28 (patch) | |
| tree | 5af6110eca8c2a21a9f699b40a87e7567c603e98 /Python/initconfig.c | |
| parent | 027adf42cd85db41fee05b0a40d89ef822876c97 (diff) | |
| download | cpython-feec49c40736fc05626a183a8d14c4ebbea5ae28.zip cpython-feec49c40736fc05626a183a8d14c4ebbea5ae28.tar.gz cpython-feec49c40736fc05626a183a8d14c4ebbea5ae28.tar.bz2 | |
GH-101578: Normalize the current exception (GH-101607)
* Make sure that the current exception is always normalized.
* Remove redundant type and traceback fields for the current exception.
* Add new API functions: PyErr_GetRaisedException, PyErr_SetRaisedException
* Add new API functions: PyException_GetArgs, PyException_SetArgs
Diffstat (limited to 'Python/initconfig.c')
| -rw-r--r-- | Python/initconfig.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Python/initconfig.c b/Python/initconfig.c index d7b2dc4..deec805 100644 --- a/Python/initconfig.c +++ b/Python/initconfig.c @@ -3143,8 +3143,7 @@ init_dump_ascii_wstr(const wchar_t *str) void _Py_DumpPathConfig(PyThreadState *tstate) { - PyObject *exc_type, *exc_value, *exc_tb; - _PyErr_Fetch(tstate, &exc_type, &exc_value, &exc_tb); + PyObject *exc = _PyErr_GetRaisedException(tstate); PySys_WriteStderr("Python path configuration:\n"); @@ -3202,5 +3201,5 @@ _Py_DumpPathConfig(PyThreadState *tstate) PySys_WriteStderr(" ]\n"); } - _PyErr_Restore(tstate, exc_type, exc_value, exc_tb); + _PyErr_SetRaisedException(tstate, exc); } |