diff options
| -rw-r--r-- | Lib/test/test_descr.py | 14 | ||||
| -rw-r--r-- | Objects/dictobject.c | 11 |
2 files changed, 18 insertions, 7 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index 627f8aa097..f1602867e7 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -1689,7 +1689,15 @@ order (MRO) for bases """ return isinstance(int, obj) def do_issubclass(obj): return issubclass(int, obj) - def swallow(*args): pass + def swallow(*args): + pass + def do_dict_missing(checker): + class DictSub(checker.__class__, dict): + pass + self.assertEqual(DictSub()["hi"], 4) + def some_number(self_, key): + self.assertEqual(key, "hi") + return 4 # It would be nice to have every special method tested here, but I'm # only listing the ones I can remember outside of typeobject.c, since it @@ -1701,6 +1709,8 @@ order (MRO) for bases """ {"__iter__" : iden, "next" : stop}), ("__sizeof__", sys.getsizeof, zero, set(), {}), ("__instancecheck__", do_isinstance, return_true, set(), {}), + ("__missing__", do_dict_missing, some_number, + set(("__class__",)), {}), ("__subclasscheck__", do_issubclass, return_true, set(("__bases__",)), {}), ("__enter__", run_context, iden, set(), {"__exit__" : swallow}), @@ -1713,7 +1723,7 @@ order (MRO) for bases """ def __getattribute__(self, attr, test=self): if attr not in ok: test.fail("__getattribute__ called with {0}".format(attr)) - return object.__getattribute__(attr) + return object.__getattribute__(self, attr) class SpecialDescr(object): def __init__(self, impl): self.impl = impl diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 931b1fca06..dbf6411b98 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1155,13 +1155,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 = - PyString_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; |