diff options
| author | Victor Stinner <vstinner@redhat.com> | 2019-04-26 03:49:26 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-26 03:49:26 (GMT) |
| commit | 87d23a041d9efb743c5680ac23305ddddf300e51 (patch) | |
| tree | f029bae963de4672d511759bd88e84d3a64544eb /Python/pylifecycle.c | |
| parent | 99e69d44f499625786a2e6461a954adcd0037d69 (diff) | |
| download | cpython-87d23a041d9efb743c5680ac23305ddddf300e51.zip cpython-87d23a041d9efb743c5680ac23305ddddf300e51.tar.gz cpython-87d23a041d9efb743c5680ac23305ddddf300e51.tar.bz2 | |
bpo-36724: Add _PyWarnings_Fini() (#12963)
Py_FinalizeEx() now clears _PyRuntime.warnings variables and
_PyRuntime.exitfuncs.
Changes:
* Add _PyWarnings_Fini(): called by Py_FinalizeEx()
* call_ll_exitfuncs() now clears _PyRuntime.exitfuncs while iterating
on it (on backward order).
Diffstat (limited to 'Python/pylifecycle.c')
| -rw-r--r-- | Python/pylifecycle.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 03486c3..ae2d0bf 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -1313,6 +1313,7 @@ Py_FinalizeEx(void) PyDict_Fini(); PySlice_Fini(); _PyGC_Fini(runtime); + _PyWarnings_Fini(runtime); _Py_HashRandomization_Fini(); _PyArg_Fini(); PyAsyncGen_Fini(); @@ -2248,7 +2249,12 @@ static void call_ll_exitfuncs(_PyRuntimeState *runtime) { while (runtime->nexitfuncs > 0) { - (*runtime->exitfuncs[--runtime->nexitfuncs])(); + /* pop last function from the list */ + runtime->nexitfuncs--; + void (*exitfunc)(void) = runtime->exitfuncs[runtime->nexitfuncs]; + runtime->exitfuncs[runtime->nexitfuncs] = NULL; + + exitfunc(); } fflush(stdout); |