From 7d79b8b7714b5e7d8a0582a07b5625c280c879c0 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 19 May 2010 20:40:50 +0000
Subject: Issue #8766: Initialize _warnings module before importing the first
 module. Fix a crash if an empty directory called "encodings" exists in
 sys.path.

---
 Python/pythonrun.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Python/pythonrun.c')

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 58388c22d9..b469c4a625 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -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)
-- 
cgit v1.2.1