diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-05-27 03:08:59 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-05-27 03:08:59 (GMT) |
| commit | a720559878f25f3f8ed46a81260844231bfc9d4b (patch) | |
| tree | 57b4275ac5e113bbbd889c9521d9e6b2aad3a007 /Objects | |
| parent | 499b2ee8a8c2a498cb068f09f6be1bfb6da85225 (diff) | |
| download | cpython-a720559878f25f3f8ed46a81260844231bfc9d4b.zip cpython-a720559878f25f3f8ed46a81260844231bfc9d4b.tar.gz cpython-a720559878f25f3f8ed46a81260844231bfc9d4b.tar.bz2 | |
Merged revisions 72957 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72957 | benjamin.peterson | 2009-05-26 21:43:46 -0500 (Tue, 26 May 2009) | 1 line
correctly handle descrs with __missing__
........
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/dictobject.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c index b39c614..97fa60b 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1128,13 +1128,14 @@ dict_subscript(PyDictObject *mp, register PyObject *key) /* Look up __missing__ method if we're a subclass. */ PyObject *missing; static PyObject *missing_str = NULL; - if (missing_str == NULL) - missing_str = - PyUnicode_InternFromString("__missing__"); - missing = _PyType_Lookup(Py_TYPE(mp), missing_str); + missing = _PyObject_LookupSpecial((PyObject *)mp, + "__missing__", + &missing_str); if (missing != NULL) return PyObject_CallFunctionObjArgs(missing, - (PyObject *)mp, key, NULL); + key, NULL); + else if (PyErr_Occurred()) + return NULL; } set_key_error(key); return NULL; |