py: Fix logic bugs in object attribute/method extraction.

This commit is contained in:
Damien George
2014-03-26 22:35:10 +00:00
parent 6022d9d478
commit c3f1126ee8
2 changed files with 35 additions and 51 deletions

View File

@@ -859,10 +859,13 @@ STATIC void rt_load_method_maybe(mp_obj_t base, qstr attr, mp_obj_t *dest) {
// return a bound method, with self being the type of this object
dest[0] = ((mp_obj_static_class_method_t*)elem->value)->fun;
dest[1] = mp_obj_get_type(base);
} else {
} else if (mp_obj_is_callable(elem->value)) {
// return a bound method, with self being this object
dest[0] = (mp_obj_t)elem->value;
dest[0] = elem->value;
dest[1] = base;
} else {
// class member is a value, so just return that value
dest[0] = elem->value;
}
}
}