diff options
| author | Raymond Hettinger <python@rcn.com> | 2010-10-30 08:17:46 +0000 |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2010-10-30 08:17:46 +0000 |
| commit | 2ad17e19eec7f873005a215a00c13520c679d4fb (patch) | |
| tree | 5afb2827106033f8bdb24c518775c6c20b0242d5 | |
| parent | cbba8d4c7a5b77ef60c088b5070b919b32a1b861 (diff) | |
| download | cpython-git-2ad17e19eec7f873005a215a00c13520c679d4fb.tar.gz | |
Issue 10221: Improve error message for dict.pop().
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Objects/dictobject.c | 3 |
2 files changed, 4 insertions, 2 deletions
@@ -10,6 +10,9 @@ What's New in Python 2.7.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 #10125: Don't segfault when the iterator passed to ``file.writelines()`` closes the file. diff --git a/Objects/dictobject.c b/Objects/dictobject.c index def3da9af0..3670e974ad 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1980,8 +1980,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 (!PyString_CheckExact(key) || |