diff options
| author | Victor Stinner <vstinner@redhat.com> | 2019-06-19 08:36:10 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-19 08:36:10 (GMT) |
| commit | 987a0dcfa1302df6c1ed8cf14762dc18628e3f33 (patch) | |
| tree | e5067c951f469056947e4b2c3312503610424abc /Python | |
| parent | 7821b4c6d29933511d50bb42255e39790c6abf00 (diff) | |
| download | cpython-987a0dcfa1302df6c1ed8cf14762dc18628e3f33.zip cpython-987a0dcfa1302df6c1ed8cf14762dc18628e3f33.tar.gz cpython-987a0dcfa1302df6c1ed8cf14762dc18628e3f33.tar.bz2 | |
bpo-36710: Remove PyImport_Cleanup() function (GH-14221)
* Rename PyImport_Cleanup() to _PyImport_Cleanup() and move it to the
internal C API. Add 'tstate' parameters.
* Remove documentation of _PyImport_Init(), PyImport_Cleanup(),
_PyImport_Fini(). All three were documented as "For internal use
only.".
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/import.c | 3 | ||||
| -rw-r--r-- | Python/pylifecycle.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Python/import.c b/Python/import.c index 5606d3b..dc0d5b8 100644 --- a/Python/import.c +++ b/Python/import.c @@ -413,9 +413,8 @@ static const char * const sys_files[] = { /* Un-initialize things, as good as we can */ void -PyImport_Cleanup(void) +_PyImport_Cleanup(PyThreadState *tstate) { - PyThreadState *tstate = _PyThreadState_GET(); PyInterpreterState *interp = tstate->interp; PyObject *modules = interp->modules; if (modules == NULL) { diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 4a97295..c0b3450 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -1225,7 +1225,7 @@ Py_FinalizeEx(void) _PySys_ClearAuditHooks(); /* Destroy all modules */ - PyImport_Cleanup(); + _PyImport_Cleanup(tstate); /* Print debug stats if any */ _PyEval_Fini(); @@ -1589,7 +1589,7 @@ Py_EndInterpreter(PyThreadState *tstate) if (tstate != interp->tstate_head || tstate->next != NULL) Py_FatalError("Py_EndInterpreter: not the last thread"); - PyImport_Cleanup(); + _PyImport_Cleanup(tstate); PyInterpreterState_Clear(interp); PyThreadState_Swap(NULL); PyInterpreterState_Delete(interp); |