From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 29 Oct 2013 23:04:59 +0000 (+0100)
Subject: Issue #19442: Fix warnings emitted during Python shutdown
X-Git-Tag: v3.4.0b1~472
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=856f45f09c1fe69cab4cf11159f60f0f0cc5bb07;p=thirdparty%2FPython%2Fcpython.git

Issue #19442: Fix warnings emitted during Python shutdown

Warnings may be emitted during Python shutdown, like "unclosed file XXX".
During shutdown, globals()['__main__'] may be None.
---

diff --git a/Python/_warnings.c b/Python/_warnings.c
index cbc64e3b9441..8d9666afcc77 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -540,7 +540,7 @@ setup_context(Py_ssize_t stack_level, PyObject **filename, int *lineno,
     }
     else {
         *filename = NULL;
-        if (PyUnicode_CompareWithASCIIString(*module, "__main__") == 0) {
+        if (*module != Py_None && PyUnicode_CompareWithASCIIString(*module, "__main__") == 0) {
             PyObject *argv = PySys_GetObject("argv");
             /* PyList_Check() is needed because sys.argv is set to None during
                Python finalization */
@@ -564,8 +564,8 @@ setup_context(Py_ssize_t stack_level, PyObject **filename, int *lineno,
             else {
                 /* embedded interpreters don't have sys.argv, see bug #839151 */
                 *filename = PyUnicode_FromString("__main__");
-                    if (*filename == NULL)
-                        goto handle_error;
+                if (*filename == NULL)
+                    goto handle_error;
             }
         }
         if (*filename == NULL) {
@@ -621,8 +621,15 @@ do_warn(PyObject *message, PyObject *category, Py_ssize_t stack_level)
     if (!setup_context(stack_level, &filename, &lineno, &module, &registry))
         return NULL;
 
-    res = warn_explicit(category, message, filename, lineno, module, registry,
-                        NULL);
+    if (module != Py_None) {
+        res = warn_explicit(category, message, filename, lineno, module, registry,
+                            NULL);
+    }
+    else {
+        /* FIXME: emitting warnings at exit does crash Python */
+        res = Py_None;
+        Py_INCREF(res);
+    }
     Py_DECREF(filename);
     Py_DECREF(registry);
     Py_DECREF(module);