mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Give 'super' a decent repr(), and readonly attributes to access the

Browse source 
type and obj properties.  The "bogus super object" message is gone --
this will now just raise an AttributeError.
This commit is contained in:
Guido van Rossum 2001-08-30 23:13:11 +00:00
parent 7561d9ead9
commit 41eb14dffa
1 changed files with 36 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

47
Objects/typeobject.c
View file

@ -3159,6 +3159,12 @@ typedef struct {
PyObject *obj; PyObject *obj;
} superobject; } superobject;
static struct memberlist super_members[] = {
{"__type__", T_OBJECT, offsetof(superobject, type), READONLY},
{"__obj__", T_OBJECT, offsetof(superobject, obj), READONLY},
{0}
};
static void static void
super_dealloc(PyObject *self) super_dealloc(PyObject *self)
{ {
@ -3169,6 +3175,22 @@ super_dealloc(PyObject *self)
self->ob_type->tp_free(self); self->ob_type->tp_free(self);
} }
static PyObject *
super_repr(PyObject *self)
{
superobject *su = (superobject *)self;
if (su->obj)
return PyString_FromFormat(
"<super: <type '%s'>, <%s object>>",
su->type ? su->type->tp_name : "NULL",
su->obj->ob_type->tp_name);
else
return PyString_FromFormat(
"<super: <type '%s'>, NULL>",
su->type ? su->type->tp_name : "NULL");
}
static PyObject * static PyObject *
super_getattro(PyObject *self, PyObject *name) super_getattro(PyObject *self, PyObject *name)
{ {
@ -3180,26 +3202,29 @@ super_getattro(PyObject *self, PyObject *name)
int i, n; int i, n;
mro = su->obj->ob_type->tp_mro; mro = su->obj->ob_type->tp_mro;
assert(mro != NULL && PyTuple_Check(mro)); if (mro == NULL)
n = PyTuple_GET_SIZE(mro); n = 0;
else {
assert(PyTuple_Check(mro));
n = PyTuple_GET_SIZE(mro);
}
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if ((PyObject *)(su->type) == PyTuple_GET_ITEM(mro, i)) if ((PyObject *)(su->type) == PyTuple_GET_ITEM(mro, i))
break; break;
} }
if (i >= n && PyType_Check(su->obj)) { if (i >= n && PyType_Check(su->obj)) {
mro = ((PyTypeObject *)(su->obj))->tp_mro; mro = ((PyTypeObject *)(su->obj))->tp_mro;
assert(mro != NULL && PyTuple_Check(mro)); if (mro == NULL)
n = PyTuple_GET_SIZE(mro); n = 0;
else {
assert(PyTuple_Check(mro));
n = PyTuple_GET_SIZE(mro);
}
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if ((PyObject *)(su->type) == if ((PyObject *)(su->type) ==
PyTuple_GET_ITEM(mro, i)) PyTuple_GET_ITEM(mro, i))
break; break;
} }
if (i >= n) {
PyErr_SetString(PyExc_TypeError,
"bogus super object");
return NULL;
}
} }
i++; i++;
res = NULL; res = NULL;
@ -3292,7 +3317,7 @@ PyTypeObject PySuper_Type = {
0, /* tp_getattr */ 0, /* tp_getattr */
0, /* tp_setattr */ 0, /* tp_setattr */
0, /* tp_compare */ 0, /* tp_compare */
0, /* tp_repr */ super_repr, /* tp_repr */
0, /* tp_as_number */ 0, /* tp_as_number */
0, /* tp_as_sequence */ 0, /* tp_as_sequence */
0, /* tp_as_mapping */ 0, /* tp_as_mapping */
@ -3311,7 +3336,7 @@ PyTypeObject PySuper_Type = {
0, /* tp_iter */ 0, /* tp_iter */
0, /* tp_iternext */ 0, /* tp_iternext */
0, /* tp_methods */ 0, /* tp_methods */
0, /* tp_members */ super_members, /* tp_members */
0, /* tp_getset */ 0, /* tp_getset */
0, /* tp_base */ 0, /* tp_base */
0, /* tp_dict */ 0, /* tp_dict */