]> granicus.if.org Git - python/commitdiff
Issue #18520: Fix _PyDict_GetItemId(), suppress _PyUnicode_FromId() error
authorVictor Stinner <victor.stinner@gmail.com>
Mon, 22 Jul 2013 21:50:57 +0000 (23:50 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Mon, 22 Jul 2013 21:50:57 +0000 (23:50 +0200)
As PyDict_GetItem(), _PyDict_GetItemId() suppresses all errors that may occur,
for historical reasons.

Objects/dictobject.c

index 36c710ed5bcfd856024f94257cd4b187652a96cf..e0cb8ac753ea667567d1232fdc023b2e0b8b8ff4 100644 (file)
@@ -2684,8 +2684,10 @@ _PyDict_GetItemId(PyObject *dp, struct _Py_Identifier *key)
 {
     PyObject *kv;
     kv = _PyUnicode_FromId(key); /* borrowed */
-    if (kv == NULL)
+    if (kv == NULL) {
+        PyErr_Clear();
         return NULL;
+    }
     return PyDict_GetItem(dp, kv);
 }