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

py/obj: Accept user types in mp_obj_get_int_maybe. 

This is possible now that MP_UNARY_OP_INT_MAYBE exists.

As a consequence mp_obj_get_int now also supports user types, which was
previously possible with MP_UNARY_OP_INT but no tests existed for it.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2023-06-01 12:12:22 +10:00
parent 48ffd6596e
commit 66dc1397c9
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
py/obj.c
View File

@ -326,7 +326,12 @@ bool mp_obj_get_int_maybe(mp_const_obj_t arg, mp_int_t *value) {
} else if (mp_obj_is_exact_type(arg, &mp_type_int)) { } else if (mp_obj_is_exact_type(arg, &mp_type_int)) {
*value = mp_obj_int_get_checked(arg); *value = mp_obj_int_get_checked(arg);
} else { } else {
return false; arg = mp_unary_op(MP_UNARY_OP_INT_MAYBE, (mp_obj_t)arg);
if (arg != MP_OBJ_NULL) {
*value = mp_obj_int_get_checked(arg);
} else {
return false;
}
} }
return true; return true;
} }

6
tests/basics/string_format_modulo.py
View File

@ -13,6 +13,12 @@ print("=%s=" % [1, 2])
print("=%s=" % "str") print("=%s=" % "str")
print("=%r=" % "str") print("=%r=" % "str")
# test calling __int__
class A:
def __int__(self):
return 123
print("%d" % A())
try: try:
print("=%s=%s=" % 1) print("=%s=%s=" % 1)
except TypeError: except TypeError: