summaryrefslogtreecommitdiffstatshomepage
path: root/py
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-04-21 02:11:07 +0100
committerDamien George <damien.p.george@gmail.com>2014-04-21 02:11:07 +0100
commit806f4aef9acd9d8990681b9ba73362d995b59417 (patch)
tree603b6d28a9072b15b8aad1d41d8d0a60ad53f161 /py
parentb33d72aa89be902e49bdd804e1494dbb901d4c07 (diff)
downloadmicropython-806f4aef9acd9d8990681b9ba73362d995b59417.tar.gz
micropython-806f4aef9acd9d8990681b9ba73362d995b59417.zip
py: Fix super() bug, where it didn't allow instance access.
This is a one-liner fix. It gets the class-super.py test passing, but is probably not a complete fix.
Diffstat (limited to 'py')
-rw-r--r--py/objtype.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/py/objtype.c b/py/objtype.c
index f281f799ed..3d22b8ec45 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -527,7 +527,7 @@ STATIC void super_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
assert(MP_OBJ_IS_TYPE(items[i], &mp_type_type));
mp_obj_t member = mp_obj_class_lookup((mp_obj_type_t*)items[i], attr);
if (member != MP_OBJ_NULL) {
- class_convert_return_attr(self, member, dest);
+ class_convert_return_attr(self->obj, member, dest);
return;
}
}