Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-03-04 12:01:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[3.6] bpo-33330: Improve error handling in PyImport_Cleanup(). (GH-6564). (GH-6604)

Browse source 
(cherry picked from commit e9d9494d6b)
This commit is contained in:
Serhiy Storchaka 2018-04-26 03:27:51 +03:00 • committed by GitHub
parent 0d19fa917c
commit b16681fb1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Python/import.c
View file

@ -354,12 +354,16 @@ PyImport_Cleanup(void)
if (Py_VerboseFlag)
PySys_WriteStderr("# clear builtins._\n");
PyDict_SetItemString(interp->builtins, "_", Py_None);
if (PyDict_SetItemString(interp->builtins, "_", Py_None) < 0) {
PyErr_Clear();
}
for (p = sys_deletes; *p != NULL; p++) {
if (Py_VerboseFlag)
PySys_WriteStderr("# clear sys.%s\n", *p);
PyDict_SetItemString(interp->sysdict, *p, Py_None);
if (PyDict_SetItemString(interp->sysdict, *p, Py_None) < 0) {
PyErr_Clear();
}
}
for (p = sys_files; *p != NULL; p+=2) {
if (Py_VerboseFlag)
@ -367,7 +371,9 @@ PyImport_Cleanup(void)
value = PyDict_GetItemString(interp->sysdict, *(p+1));
if (value == NULL)
value = Py_None;
PyDict_SetItemString(interp->sysdict, *p, value);
if (PyDict_SetItemString(interp->sysdict, *p, value) < 0) {
PyErr_Clear();
}
}
/* We prepare a list which will receive (name, weakref) tuples of
@ -381,14 +387,17 @@ PyImport_Cleanup(void)
#define STORE_MODULE_WEAKREF(name, mod) \
if (weaklist != NULL) { \
PyObject *wr = PyWeakref_NewRef(mod, NULL); \
if (name && wr) { \
if (wr) { \
PyObject *tup = PyTuple_Pack(2, name, wr); \
PyList_Append(weaklist, tup); \
if (!tup || PyList_Append(weaklist, tup) < 0) { \
PyErr_Clear(); \
} \
Py_XDECREF(tup); \
Py_DECREF(wr); \
} \
Py_XDECREF(wr); \
if (PyErr_Occurred()) \
else { \
PyErr_Clear(); \
} \
}
/* Remove all modules from sys.modules, hoping that garbage collection
@ -399,7 +408,9 @@ PyImport_Cleanup(void)
if (Py_VerboseFlag && PyUnicode_Check(key))
PySys_FormatStderr("# cleanup[2] removing %U\n", key);
STORE_MODULE_WEAKREF(key, value);
PyDict_SetItem(modules, key, Py_None);
if (PyDict_SetItem(modules, key, Py_None) < 0) {
PyErr_Clear();
}
}
}
@ -472,6 +483,7 @@ PyImport_Cleanup(void)
/* Once more */
_PyGC_CollectNoFail();
#undef CLEAR_MODULE
#undef STORE_MODULE_WEAKREF
}