commit 5b3b1006bbb25902a6981b3447032d2b743be4c4
author Victor Stinner <victor.stinner@gmail.com> Mon Jul 22 23:50:57 2013 +0200
committer Victor Stinner <victor.stinner@gmail.com> Mon Jul 22 23:50:57 2013 +0200
tree 86cfa5201b3fe4a7f841b481501ead6e84fb4614
parent 34f96b8dd35dd4339db86f18beeccfbec124df1a

Issue #18520: Fix _PyDict_GetItemId(), suppress _PyUnicode_FromId() error

As PyDict_GetItem(), _PyDict_GetItemId() suppresses all errors that may occur,
for historical reasons.

Objects/dictobject.c

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 36c710e..e0cb8ac 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -2684,8 +2684,10 @@
 {
     PyObject *kv;
     kv = _PyUnicode_FromId(key); /* borrowed */
-    if (kv == NULL)
+    if (kv == NULL) {
+        PyErr_Clear();
         return NULL;
+    }
     return PyDict_GetItem(dp, kv);
 }