mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-19 17:25:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #8766: Initialize _warnings module before importing the first module.

Browse source 
Fix a crash if an empty directory called "encodings" exists in sys.path.
This commit is contained in:
Victor Stinner 2010-05-19 20:40:50 +00:00
parent 5b08b4d230
commit 7d79b8b771
4 changed files with 36 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Python/_warnings.c
View file

@ -116,7 +116,7 @@ get_filter(PyObject *category, PyObject *text, Py_ssize_t lineno,
_filters = warnings_filters;
}
if (!PyList_Check(_filters)) {
if (_filters == NULL || !PyList_Check(_filters)) {
PyErr_SetString(PyExc_ValueError,
MODULE_NAME ".filters must be a list");
return NULL;

4
Python/pythonrun.c
View file

@ -265,13 +265,15 @@ Py_InitializeEx(int install_sigs)
_PyImportHooks_Init();
/* Initialize _warnings. */
_PyWarnings_Init();
initfsencoding();
if (install_sigs)
initsigs(); /* Signal handling stuff, including initintr() */
/* Initialize warnings. */
_PyWarnings_Init();
if (PySys_HasWarnOptions()) {
PyObject *warnings_module = PyImport_ImportModule("warnings");
if (!warnings_module)