diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 1cf3725cd2..07323bfc83 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -205,6 +205,10 @@ msgstr "" msgid "%q, %q, and %q must all be the same length" msgstr "" +#: py/objint.c +msgid "%q=%q" +msgstr "" + #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c #, c-format msgid "%s error 0x%x" @@ -2450,10 +2454,6 @@ msgstr "" msgid "byteorder is not a string" msgstr "" -#: py/objint.c -msgid "byteorder must be 'little' or 'big'" -msgstr "" - #: py/objarray.c msgid "bytes length not a multiple of item size" msgstr "" @@ -2957,10 +2957,6 @@ msgstr "" msgid "frequency is read-only for this board" msgstr "" -#: py/objint.c -msgid "from_bytes() does not implement signed=True" -msgstr "" - #: py/objdeque.c msgid "full" msgstr "" diff --git a/py/objint.c b/py/objint.c index fa8bc7985c..b44a2e3b4a 100644 --- a/py/objint.c +++ b/py/objint.c @@ -483,28 +483,30 @@ MP_DEFINE_CONST_FUN_OBJ_1(int_bit_length_obj, int_bit_length); STATIC mp_obj_t int_from_bytes(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { // TODO: Support signed param (assumes signed=False at the moment) - enum { ARG_signed }; + enum { ARG_bytes, ARG_byteorder, ARG_signed }; static const mp_arg_t allowed_args[] = { - { MP_QSTR_signed, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} }, + { MP_QSTR_bytes, MP_ARG_REQUIRED | MP_ARG_OBJ }, + { MP_QSTR_byteorder, MP_ARG_REQUIRED | MP_ARG_OBJ }, + { MP_QSTR_signed, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} }, }; mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; - mp_arg_parse_all(n_args - 3, pos_args + 3, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); + mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); if (args[ARG_signed].u_bool) { - mp_raise_msg(&mp_type_NotImplementedError, MP_ERROR_TEXT("from_bytes() does not implement signed=True")); + mp_raise_NotImplementedError_varg(MP_ERROR_TEXT("%q=%q"), MP_QSTR_signed, MP_QSTR_True); } // get the buffer info mp_buffer_info_t bufinfo; - mp_get_buffer_raise(pos_args[1], &bufinfo, MP_BUFFER_READ); + mp_get_buffer_raise(args[ARG_bytes].u_obj, &bufinfo, MP_BUFFER_READ); const byte *buf = (const byte *)bufinfo.buf; int delta = 1; - if (pos_args[2] == MP_OBJ_NEW_QSTR(MP_QSTR_little)) { + if (args[ARG_byteorder].u_obj == MP_OBJ_NEW_QSTR(MP_QSTR_little)) { buf += bufinfo.len - 1; delta = -1; - } else if (pos_args[2] != MP_OBJ_NEW_QSTR(MP_QSTR_big)) { - mp_raise_ValueError(MP_ERROR_TEXT("byteorder must be 'little' or 'big'")); + } else if (args[ARG_byteorder].u_obj != MP_OBJ_NEW_QSTR(MP_QSTR_big)) { + mp_arg_error_invalid(MP_QSTR_byteorder); } mp_uint_t value = 0; @@ -513,7 +515,7 @@ STATIC mp_obj_t int_from_bytes(size_t n_args, const mp_obj_t *pos_args, mp_map_t #if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE if (value > (MP_SMALL_INT_MAX >> 8)) { // Result will overflow a small-int so construct a big-int - return mp_obj_int_from_bytes_impl(pos_args[2] != MP_OBJ_NEW_QSTR(MP_QSTR_little), bufinfo.len, bufinfo.buf); + return mp_obj_int_from_bytes_impl(args[ARG_byteorder].u_obj != MP_OBJ_NEW_QSTR(MP_QSTR_little), bufinfo.len, bufinfo.buf); } #endif value = (value << 8) | *buf;