Fix bug 683658 - PyErr_Warn may cause import deadlock.

3 files changed, 19 insertions, 6 deletions

diff --git a/Lib/warnings.py b/Lib/warnings.py
index 16ae331..bab007f 100644
--- a/Lib/warnings.py
+++ b/Lib/warnings.py
@@ -1,6 +1,10 @@
 """Python part of the warnings subsystem."""
 
+# Note: function level imports should *not* be used
+# in this module as it may cause import lock deadlock.
+# See bug 683658.
 import sys, re, types
+import linecache
 
 __all__ = ["warn", "showwarning", "formatwarning", "filterwarnings",
            "resetwarnings"]
@@ -114,7 +118,6 @@ def showwarning(message, category, filename, lineno, file=None):
 
 def formatwarning(message, category, filename, lineno):
     """Function to format a warning the standard way."""
-    import linecache
     s =  "%s:%s: %s: %s\n" % (filename, lineno, category.__name__, message)
     line = linecache.getline(filename, lineno).strip()
     if line:
diff --git a/Python/errors.c b/Python/errors.c
index e509606..d08c1af 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -600,18 +600,17 @@ PyErr_WriteUnraisable(PyObject *obj)
 	Py_XDECREF(tb);
 }
 
+extern PyObject *PyModule_WarningsModule;
 
 /* Function to issue a warning message; may raise an exception. */
 int
 PyErr_Warn(PyObject *category, char *message)
 {
-	PyObject *mod, *dict, *func = NULL;
+	PyObject *dict, *func = NULL;
 
-	mod = PyImport_ImportModule("warnings");
-	if (mod != NULL) {
-		dict = PyModule_GetDict(mod);
+	if (PyModule_WarningsModule != NULL) {
+		dict = PyModule_GetDict(PyModule_WarningsModule);
 		func = PyDict_GetItemString(dict, "warn");
-		Py_DECREF(mod);
 	}
 	if (func == NULL) {
 		PySys_WriteStderr("warning: %s\n", message);
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 1faab50..2845d24 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -60,6 +60,11 @@ int Py_IgnoreEnvironmentFlag; /* e.g. PYTHONPATH, PYTHONHOME */
   true divisions (which they will be in 2.3). */
 int _Py_QnewFlag = 0;
 
+/* Reference to 'warnings' module, to avoid importing it
+   on the fly when the import lock may be held.  See 683658
+*/
+PyObject *PyModule_WarningsModule = NULL;
+
 static int initialized = 0;
 
 /* API to access the initialized flag -- useful for esoteric use */
@@ -169,6 +174,8 @@ Py_Initialize(void)
 
 	_PyImportHooks_Init();
 
+	PyModule_WarningsModule = PyImport_ImportModule("warnings");
+
 	initsigs(); /* Signal handling stuff, including initintr() */
 
 	initmain(); /* Module __main__ */
@@ -225,6 +232,10 @@ Py_Finalize(void)
 	/* Cleanup Codec registry */
 	_PyCodecRegistry_Fini();
 
+	/* drop module references we saved */
+	Py_XDECREF(PyModule_WarningsModule);
+	PyModule_WarningsModule = NULL;
+
 	/* Destroy all modules */
 	PyImport_Cleanup();