Issue 10221: Improve error message for dict.pop().

diff --git a/Misc/NEWS b/Misc/NEWS
index b1e701d8f208c217ede68fc90dab2c23bfbc07a3..52fecdd17b39a68d8c5305b69babed33d28f67d1 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.2 Beta 1?
 Core and Builtins
 -----------------
 
+- Issue #10221: dict.pop(k) now has a key error message that includes the
+  missing key (same message d[k] returns for missing keys).
+
 - Issue #5437: A preallocated MemoryError instance should not hold traceback
   data (including local variables caught in the stack trace) alive infinitely.
 

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index d932ba7723eb9bc88f47868aaf4d9835bc800341..1015772898430e6e73a55b62b15100b7343626ea 100644 (file)
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -1820,8 +1820,7 @@ dict_pop(PyDictObject *mp, PyObject *args)
             Py_INCREF(deflt);
             return deflt;
         }
-        PyErr_SetString(PyExc_KeyError,
-                        "pop(): dictionary is empty");
+        set_key_error(key);
         return NULL;
     }
     if (!PyUnicode_CheckExact(key) ||