traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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__
........
This commit is contained in:
Benjamin Peterson 2009-05-27 03:08:59 +00:00
parent 499b2ee8a8
commit a720559878
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/test/test_descr.py
View File

@ -1562,6 +1562,13 @@ order (MRO) for bases """
return isinstance(int, obj) return isinstance(int, obj)
def do_issubclass(obj): def do_issubclass(obj):
return issubclass(int, obj) return issubclass(int, obj)
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 # 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 # only listing the ones I can remember outside of typeobject.c, since it
@ -1573,6 +1580,8 @@ order (MRO) for bases """
{"__iter__" : iden, "__next__" : stop}), {"__iter__" : iden, "__next__" : stop}),
("__sizeof__", sys.getsizeof, zero, set(), {}), ("__sizeof__", sys.getsizeof, zero, set(), {}),
("__instancecheck__", do_isinstance, return_true, set(), {}), ("__instancecheck__", do_isinstance, return_true, set(), {}),
("__missing__", do_dict_missing, some_number,
set(("__class__",)), {}),
("__subclasscheck__", do_issubclass, return_true, ("__subclasscheck__", do_issubclass, return_true,
set(("__bases__",)), {}), set(("__bases__",)), {}),
# These two fail because the compiler generates LOAD_ATTR to look # These two fail because the compiler generates LOAD_ATTR to look
@ -1588,7 +1597,7 @@ order (MRO) for bases """
def __getattribute__(self, attr, test=self): def __getattribute__(self, attr, test=self):
if attr not in ok: if attr not in ok:
test.fail("__getattribute__ called with {0}".format(attr)) test.fail("__getattribute__ called with {0}".format(attr))
return object.__getattribute__(attr) return object.__getattribute__(self, attr)
class SpecialDescr(object): class SpecialDescr(object):
def __init__(self, impl): def __init__(self, impl):
self.impl = impl self.impl = impl

11
Objects/dictobject.c
View File

@ -1128,13 +1128,14 @@ dict_subscript(PyDictObject *mp, register PyObject *key)
/* Look up __missing__ method if we're a subclass. */ /* Look up __missing__ method if we're a subclass. */
PyObject *missing; PyObject *missing;
static PyObject *missing_str = NULL; static PyObject *missing_str = NULL;
if (missing_str == NULL) missing = _PyObject_LookupSpecial((PyObject *)mp,
missing_str = "__missing__",
PyUnicode_InternFromString("__missing__"); &missing_str);
missing = _PyType_Lookup(Py_TYPE(mp), missing_str);
if (missing != NULL) if (missing != NULL)
return PyObject_CallFunctionObjArgs(missing, return PyObject_CallFunctionObjArgs(missing,
(PyObject *)mp, key, NULL); key, NULL);
else if (PyErr_Occurred())
return NULL;
} }
set_key_error(key); set_key_error(key);
return NULL; return NULL;