(original) (raw)

changeset: 84672:ac4e8e6a7436 user: Victor Stinner victor.stinner@gmail.com date: Tue Jul 16 22:16:05 2013 +0200 files: Objects/dictobject.c description: Issue #18408: Fix PyDict_GetItemString(), suppress PyUnicode_FromString() error As PyDict_GetItem(), PyDict_GetItemString() suppresses all errors that may occur for historical reasons. diff -r 395e67f348e7 -r ac4e8e6a7436 Objects/dictobject.c --- a/Objects/dictobject.c Tue Jul 16 21:45:58 2013 +0200 +++ b/Objects/dictobject.c Tue Jul 16 22:16:05 2013 +0200 @@ -2692,8 +2692,10 @@ { PyObject *kv, *rv; kv = PyUnicode_FromString(key); - if (kv == NULL) + if (kv == NULL) { + PyErr_Clear(); return NULL; + } rv = PyDict_GetItem(v, kv); Py_DECREF(kv); return rv; /victor.stinner@gmail.com