From 69dd013919461272b3669a516ef98d60accd3165 Mon Sep 17 00:00:00 2001 From: Damien George Date: Tue, 23 May 2023 18:02:32 +1000 Subject: [PATCH] py/objint: Allow int() to parse anything with the buffer protocol. This generalises and simplifies the code and follows CPython behaviour. See similar change for floats in a07fc5b6403b9a8bf7e7cb64f857272e5346d7e2. Signed-off-by: Damien George --- py/objint.c | 9 ++++----- tests/basics/int_parse.py | 12 ++++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 tests/basics/int_parse.py diff --git a/py/objint.c b/py/objint.c index e54cdb89b..be5f4653a 100644 --- a/py/objint.c +++ b/py/objint.c @@ -49,14 +49,13 @@ STATIC mp_obj_t mp_obj_int_make_new(const mp_obj_type_t *type_in, size_t n_args, return MP_OBJ_NEW_SMALL_INT(0); case 1: { + mp_buffer_info_t bufinfo; mp_obj_t o = mp_unary_op(MP_UNARY_OP_INT_MAYBE, args[0]); if (o != MP_OBJ_NULL) { return o; - } else if (mp_obj_is_str_or_bytes(args[0])) { - // a string, parse it - size_t l; - const char *s = mp_obj_str_get_data(args[0], &l); - return mp_parse_num_integer(s, l, 0, NULL); + } else if (mp_get_buffer(args[0], &bufinfo, MP_BUFFER_READ)) { + // a textual representation, parse it + return mp_parse_num_integer(bufinfo.buf, bufinfo.len, 0, NULL); #if MICROPY_PY_BUILTINS_FLOAT } else if (mp_obj_is_float(args[0])) { return mp_obj_new_int_from_float(mp_obj_float_get(args[0])); diff --git a/tests/basics/int_parse.py b/tests/basics/int_parse.py new file mode 100644 index 000000000..cc41158c5 --- /dev/null +++ b/tests/basics/int_parse.py @@ -0,0 +1,12 @@ +# Test parsing ints. + +try: + bytearray + memoryview +except NameError: + print("SKIP") + raise SystemExit + +print(int(b"123")) +print(int(bytearray(b"123"))) +print(int(memoryview(b"123")))