traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Close #19442: warn_explicit() does nothing when called late during Python shutdown 

After more tests, I now think that it is the safest option.
This commit is contained in:
Victor Stinner 2013-11-01 00:55:30 +01:00
parent 6ec518bd8e
commit dcdd05b0b4
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Python/_warnings.c
View File

@ -333,6 +333,13 @@ warn_explicit(PyObject *category, PyObject *message,
PyObject *action; PyObject *action;
int rc; int rc;
/* module can be None if a warning is emitted late during Python shutdown.
In this case, the Python warnings module was probably unloaded, filters
are no more available to choose as action. It is safer to ignore the
warning and do nothing. */
if (module == Py_None)
Py_RETURN_NONE;
if (registry && !PyDict_Check(registry) && (registry != Py_None)) { if (registry && !PyDict_Check(registry) && (registry != Py_None)) {
PyErr_SetString(PyExc_TypeError, "'registry' must be a dict"); PyErr_SetString(PyExc_TypeError, "'registry' must be a dict");
return NULL; return NULL;
@ -635,15 +642,8 @@ do_warn(PyObject *message, PyObject *category, Py_ssize_t stack_level)
if (!setup_context(stack_level, &filename, &lineno, &module, &registry)) if (!setup_context(stack_level, &filename, &lineno, &module, &registry))
return NULL; return NULL;
if (module != Py_None) { res = warn_explicit(category, message, filename, lineno, module, registry,
res = warn_explicit(category, message, filename, lineno, module, registry, NULL);
NULL);
}
else {
/* FIXME: emitting warnings at exit does crash Python */
res = Py_None;
Py_INCREF(res);
}
Py_DECREF(filename); Py_DECREF(filename);
Py_DECREF(registry); Py_DECREF(registry);
Py_DECREF(module); Py_DECREF(module);