Index: Objects/dictobject.c =================================================================== --- Objects/dictobject.c (revision 85893) +++ Objects/dictobject.c (working copy) @@ -1820,8 +1820,7 @@ Py_INCREF(deflt); return deflt; } - PyErr_SetString(PyExc_KeyError, - "pop(): dictionary is empty"); + set_key_error(key); return NULL; } if (!PyUnicode_CheckExact(key) ||