objtype: super: Add stop condition for looking up in base types.

pfalcon · pfalcon · commit 6a410789b8ff · 2014-05-21T22:27:03.000+03:00
diff --git 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;
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -735,6 +735,9 @@ STATIC void super_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {`
`735`	`735`	`for (uint i = 0; i < len; i++) {`
`736`	`736`	`assert(MP_OBJ_IS_TYPE(items[i], &mp_type_type));`
`737`	`737`	`mp_obj_class_lookup(self->obj, (mp_obj_type_t*)items[i], attr, 0, dest);`
	`738`	`+ if (dest[0] != MP_OBJ_NULL) {`
	`739`	`+ return;`
	`740`	`+ }`
`738`	`741`	`}`
`739`	`742`	`}`
`740`	`743`