diff options
| author | Eric Snow <ericsnowcurrently@gmail.com> | 2019-04-12 10:20:10 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-12 10:20:10 -0600 |
| commit | b75b1a3504a0cea6fac6ecba44c10b2629577025 (patch) | |
| tree | 14d6fd9909a1f4ec1ca70ba012569bd495d35d5a /Python/pylifecycle.c | |
| parent | f938d8be4ce3e1ccca7c31cf673265634307147f (diff) | |
| download | cpython-git-b75b1a3504a0cea6fac6ecba44c10b2629577025.tar.gz | |
bpo-33608: Revert "Factor out a private, per-interpreter _Py_AddPendingCall()." (gh-12806)
This reverts commit f13c5c8b9401a9dc19e95d8b420ee100ac022208 (gh-12360).
Diffstat (limited to 'Python/pylifecycle.c')
| -rw-r--r-- | Python/pylifecycle.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 44acba2d93..ad1447256c 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -1146,7 +1146,7 @@ Py_FinalizeEx(void) interp = tstate->interp; // Make any remaining pending calls. - _Py_FinishPendingCalls(interp); + _Py_FinishPendingCalls(); /* The interpreter is still entirely intact at this point, and the * exit funcs may be relying on that. In particular, if some thread @@ -1552,9 +1552,6 @@ Py_EndInterpreter(PyThreadState *tstate) // Wrap up existing "threading"-module-created, non-daemon threads. wait_for_thread_shutdown(); - // Make any remaining pending calls. - _Py_FinishPendingCalls(interp); - call_py_exitfuncs(interp); if (tstate != interp->tstate_head || tstate->next != NULL) |