commit ee09d7c098ae4e52a9110ea0e1b55de3996c59f5
author Serhiy Storchaka <storchaka@gmail.com> Wed Feb 12 09:54:48 2014 +0200
committer Serhiy Storchaka <storchaka@gmail.com> Wed Feb 12 09:54:48 2014 +0200
tree fa8f1a275d79055ce13c98841682c5cab45cd424
parent ad38ef7c09edf0b923f9c736cc440f95313c8a0a

Issue #19255: Clear error after failed PyDict_SetItem() on shutdown.
This silences a Coverity complain.

Objects/moduleobject.c

diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
index 08e9740..f2fed30 100644
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -122,7 +122,8 @@
             if (s[0] == '_' && s[1] != '_') {
                 if (Py_VerboseFlag > 1)
                     PySys_WriteStderr("#   clear[1] %s\n", s);
-                PyDict_SetItem(d, key, Py_None);
+                if (PyDict_SetItem(d, key, Py_None) != 0)
+                    PyErr_Clear();
             }
         }
     }
@@ -135,7 +136,8 @@
             if (s[0] != '_' || strcmp(s, "__builtins__") != 0) {
                 if (Py_VerboseFlag > 1)
                     PySys_WriteStderr("#   clear[2] %s\n", s);
-                PyDict_SetItem(d, key, Py_None);
+                if (PyDict_SetItem(d, key, Py_None) != 0)
+                    PyErr_Clear();
             }
         }
     }