mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-09 20:35:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Recorded merge of revisions 81364 via svnmerge from

Browse source 
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:
Victor Stinner 2010-05-20 21:00:34 +00:00
parent 784c027d18
commit 148051a054
4 changed files with 47 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Python/pythonrun.c
View file

@ -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)