From 7e7940c39d757a7f8fdeb809455016816ed90272 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sun, 11 May 2014 20:35:02 +0300
Subject: [PATCH] py: Fix __len__ special method result handling.
Having both MP_OBJ_NOT_SUPPORTED and MP_OBJ_NULL is arguably confusing.
---
py/obj.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/py/obj.c b/py/obj.c
index e4bf7d7df..437346b62 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -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;
}
--
GitLab