summaryrefslogtreecommitdiffstatshomepage
path: root/py
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-05-21 00:54:46 +0300
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-05-21 22:27:03 +0300
commit6a410789b8ff085baf304fdd3bef2bae6e1377fe (patch)
treed9c99c60676924d2454dd0f27d3285e6c9bc7e55 /py
parentaa7cf6f72f4e8a553f892629bb3338ab8c982d57 (diff)
downloadmicropython-6a410789b8ff085baf304fdd3bef2bae6e1377fe.tar.gz
micropython-6a410789b8ff085baf304fdd3bef2bae6e1377fe.zip
objtype: super: Add stop condition for looking up in base types.
Diffstat (limited to 'py')
-rw-r--r--py/objtype.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/py/objtype.c b/py/objtype.c
index 2e1c56416e..ed45922748 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -735,6 +735,9 @@ STATIC void super_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
for (uint i = 0; i < len; i++) {
assert(MP_OBJ_IS_TYPE(items[i], &mp_type_type));
mp_obj_class_lookup(self->obj, (mp_obj_type_t*)items[i], attr, 0, dest);
+ if (dest[0] != MP_OBJ_NULL) {
+ return;
+ }
}
}