Skip to content

[3.7] bpo-33330: Improve error handling in PyImport_Cleanup(). (GH-6564) #6601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2018
Merged

[3.7] bpo-33330: Improve error handling in PyImport_Cleanup(). (GH-6564) #6601

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 24 additions & 9 deletions Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ PyImport_GetModule(PyObject *name)
}
else {
m = PyObject_GetItem(modules, name);
if (PyErr_ExceptionMatches(PyExc_KeyError)) {
if (m == NULL && PyErr_ExceptionMatches(PyExc_KeyError)) {
PyErr_Clear();
}
}
Expand Down Expand Up @@ -416,20 +416,26 @@ 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)
PySys_WriteStderr("# restore sys.%s\n", *p);
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
Expand All @@ -443,21 +449,26 @@ 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(); \
} \
}
#define CLEAR_MODULE(name, mod) \
if (PyModule_Check(mod)) { \
if (Py_VerboseFlag && PyUnicode_Check(name)) \
PySys_FormatStderr("# cleanup[2] removing %U\n", name); \
STORE_MODULE_WEAKREF(name, mod); \
PyObject_SetItem(modules, name, Py_None); \
if (PyObject_SetItem(modules, name, Py_None) < 0) { \
PyErr_Clear(); \
} \
}

/* Remove all modules from sys.modules, hoping that garbage collection
Expand All @@ -484,6 +495,9 @@ PyImport_Cleanup(void)
Py_DECREF(value);
Py_DECREF(key);
}
if (PyErr_Occurred()) {
PyErr_Clear();
}
Py_DECREF(iterator);
}
}
Expand Down Expand Up @@ -564,6 +578,7 @@ PyImport_Cleanup(void)
/* Once more */
_PyGC_CollectNoFail();

#undef CLEAR_MODULE
#undef STORE_MODULE_WEAKREF
}

Expand Down