Recorded merge of revisions 81364 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r81364 | victor.stinner | 2010-05-19 22:40:50 +0200 (mer., 19 mai 2010) | 3 lines Issue #8766: Initialize _warnings module before importing the first module. Fix a crash if an empty directory called "encodings" exists in sys.path. ........
This commit is contained in:
@@ -264,6 +264,9 @@ Py_InitializeEx(int install_sigs)
|
||||
|
||||
_PyImportHooks_Init();
|
||||
|
||||
/* Initialize _warnings. */
|
||||
_PyWarnings_Init();
|
||||
|
||||
#if defined(HAVE_LANGINFO_H) && defined(CODESET)
|
||||
/* On Unix, set the file system encoding according to the
|
||||
user's preference, if the CODESET names a well-known
|
||||
@@ -284,7 +287,6 @@ Py_InitializeEx(int install_sigs)
|
||||
initsigs(); /* Signal handling stuff, including initintr() */
|
||||
|
||||
/* Initialize warnings. */
|
||||
_PyWarnings_Init();
|
||||
if (PySys_HasWarnOptions()) {
|
||||
PyObject *warnings_module = PyImport_ImportModule("warnings");
|
||||
if (!warnings_module)
|
||||
|
||||
Reference in New Issue
Block a user