From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 22 Jul 2013 21:50:57 +0000 (+0200)
Subject: Issue #18520: Fix _PyDict_GetItemId(), suppress _PyUnicode_FromId() error
X-Git-Tag: v3.4.0a1~98
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b3b1006bbb25902a6981b3447032d2b743be4c4;p=thirdparty%2FPython%2Fcpython.git

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

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

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 36c710ed5bcf..e0cb8ac753ea 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -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);
 }