mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix another reincarnation of bug #1576657 in defaultdict.

This commit is contained in:
Georg Brandl 2007-03-06 13:32:52 +00:00
parent 098cd69ff9
commit b51a57eb32
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/_collectionsmodule.c
View File

@ -1075,7 +1075,7 @@ static PyTypeObject defdict_type; /* Forward */
PyDoc_STRVAR(defdict_missing_doc, PyDoc_STRVAR(defdict_missing_doc,
"__missing__(key) # Called by __getitem__ for missing key; pseudo-code:\n\ "__missing__(key) # Called by __getitem__ for missing key; pseudo-code:\n\
if self.default_factory is None: raise KeyError(key)\n\ if self.default_factory is None: raise KeyError((key,))\n\
self[key] = value = self.default_factory()\n\ self[key] = value = self.default_factory()\n\
return value\n\ return value\n\
"); ");
@ -1087,7 +1087,11 @@ defdict_missing(defdictobject *dd, PyObject *key)
PyObject *value; PyObject *value;
if (factory == NULL || factory == Py_None) { if (factory == NULL || factory == Py_None) {
/* XXX Call dict.__missing__(key) */ /* XXX Call dict.__missing__(key) */
PyErr_SetObject(PyExc_KeyError, key); PyObject *tup;
tup = PyTuple_Pack(1, key);
if (!tup) return NULL;
PyErr_SetObject(PyExc_KeyError, tup);
Py_DECREF(tup);
return NULL; return NULL;
} }
value = PyEval_CallObject(factory, NULL); value = PyEval_CallObject(factory, NULL);