diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2015-03-16 13:41:57 +0200 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2015-03-16 13:41:57 +0200 |
| commit | f0dc0d50e3bfbdf77cdefd7a722f1f7884fa1a73 (patch) | |
| tree | 059b5d7ae9ad9a1d954320927ce820c2e4a75303 /py | |
| parent | 2b67a40fdb9918a82c4da67a3f7ae4b3a5e29ce7 (diff) | |
| download | micropython-f0dc0d50e3bfbdf77cdefd7a722f1f7884fa1a73.tar.gz micropython-f0dc0d50e3bfbdf77cdefd7a722f1f7884fa1a73.zip | |
objtype: mp_obj_class_lookup: Remove implausible condition.
We already have branch for lookup->is_type == true, so here it's guaranteed
to be false.
Diffstat (limited to 'py')
| -rw-r--r-- | py/objtype.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/py/objtype.c b/py/objtype.c index 6421f7f099..b390e70d4f 100644 --- a/py/objtype.c +++ b/py/objtype.c @@ -135,7 +135,7 @@ STATIC void mp_obj_class_lookup(struct class_lookup_data *lookup, const mp_obj_ // not type where we found a class method. const mp_obj_type_t *org_type = (const mp_obj_type_t*)lookup->obj; instance_convert_return_attr(NULL, org_type, elem->value, lookup->dest); - } else if (lookup->obj != MP_OBJ_NULL && !lookup->is_type && is_native_type(type) && type != &mp_type_object /* object is not a real type */) { + } else if (lookup->obj != MP_OBJ_NULL && is_native_type(type) && type != &mp_type_object /* object is not a real type */) { instance_convert_return_attr(lookup->obj->subobj[0], type, elem->value, lookup->dest); } else { instance_convert_return_attr(lookup->obj, type, elem->value, lookup->dest); |