Skip to content

Commit fe3e8ee

Browse files
committed
Add bytearray.decode() for CPython compatibility
CPython has a `decode()` method on `bytearray`. This adds that method using the code from `bytes.decode`. Test program: ```python byte_boi = bytes([0x6D, 0x65, 0x65, 0x70]) print(byte_boi) # b'meep' byte_boi_str = byte_boi.decode("utf-8") print(byte_boi_str) # meep byte_array_boi = bytearray(byte_boi) print(byte_array_boi) # bytearray(b'meep') byte_array_boi_str = byte_array_boi.decode("utf-8") print(byte_array_boi_str) # meep print(byte_array_boi_str == byte_boi_str) # True ```
1 parent bd78ab3 commit fe3e8ee

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

py/objarray.c

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ STATIC mp_obj_t array_iterator_new(mp_obj_t array_in, mp_obj_iter_buf_t *iter_bu
6363
STATIC mp_obj_t array_append(mp_obj_t self_in, mp_obj_t arg);
6464
STATIC mp_obj_t array_extend(mp_obj_t self_in, mp_obj_t arg_in);
6565
STATIC mp_int_t array_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags);
66+
#if MICROPY_CPYTHON_COMPAT
67+
STATIC mp_obj_t array_decode(size_t n_args, const mp_obj_t *args);
68+
#endif
69+
6670

6771
/******************************************************************************/
6872
// array
@@ -546,10 +550,30 @@ STATIC mp_int_t array_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_ui
546550
return 0;
547551
}
548552

553+
554+
#if MICROPY_CPYTHON_COMPAT
555+
// Directly lifted from objstr.c
556+
STATIC mp_obj_t array_decode(size_t n_args, const mp_obj_t *args) {
557+
mp_obj_t new_args[2];
558+
if (n_args == 1) {
559+
new_args[0] = args[0];
560+
new_args[1] = MP_OBJ_NEW_QSTR(MP_QSTR_utf_hyphen_8);
561+
args = new_args;
562+
n_args++;
563+
}
564+
return mp_obj_str_make_new(&mp_type_str, n_args, args, NULL);
565+
}
566+
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(array_decode_obj, 1, 3, array_decode);
567+
#endif
568+
569+
549570
#if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
550571
STATIC const mp_rom_map_elem_t array_locals_dict_table[] = {
551572
{ MP_ROM_QSTR(MP_QSTR_append), MP_ROM_PTR(&array_append_obj) },
552573
{ MP_ROM_QSTR(MP_QSTR_extend), MP_ROM_PTR(&array_extend_obj) },
574+
#if MICROPY_CPYTHON_COMPAT
575+
{ MP_ROM_QSTR(MP_QSTR_decode), MP_ROM_PTR(&array_decode_obj) },
576+
#endif
553577
};
554578

555579
STATIC MP_DEFINE_CONST_DICT(array_locals_dict, array_locals_dict_table);

0 commit comments

Comments
 (0)