djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py: Fix __len__ special method result handling.

Browse Source 
Having both MP_OBJ_NOT_SUPPORTED and MP_OBJ_NULL is arguably confusing.
This commit is contained in:
Paul Sokolovsky 2014-05-11 20:35:02 +03:00
parent c48d6f7add
commit 7e7940c39d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
py/obj.c
View File

@ -357,7 +357,12 @@ mp_obj_t mp_obj_len_maybe(mp_obj_t o_in) {
} else {
mp_obj_type_t *type = mp_obj_get_type(o_in);
if (type->unary_op != NULL) {
return type->unary_op(MP_UNARY_OP_LEN, o_in);
mp_obj_t val = type->unary_op(MP_UNARY_OP_LEN, o_in);
// TODO: Here's the case of having MP_OBJ_NOT_SUPPORTED is confusing
if (val == MP_OBJ_NOT_SUPPORTED) {
return MP_OBJ_NULL;
}
return val;
} else {
return MP_OBJ_NULL;
}