@@ -412,10 +412,7 @@ STATIC mp_obj_t buffer_finder(size_t n_args, const mp_obj_t *args, int direction
412
412
mp_get_buffer_raise (args [1 ], & needle_bufinfo , MP_BUFFER_READ );
413
413
414
414
if (mp_binary_get_size ('@' , needle_bufinfo .typecode , NULL ) != 1 ) {
415
- const qstr src_name = mp_obj_get_type (args [1 ])-> name ;
416
- nlr_raise (mp_obj_new_exception_msg_varg (& mp_type_TypeError ,
417
- translate ("'%q' object is not bytes-like" ),
418
- src_name ));
415
+ mp_raise_TypeError (translate ("a bytes-like object is required" ));
419
416
}
420
417
421
418
const byte * start = haystack_bufinfo .buf ;
@@ -447,6 +444,7 @@ STATIC mp_obj_t buffer_find(size_t n_args, const mp_obj_t *args) {
447
444
}
448
445
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN (buffer_find_obj , 2 , 4 , buffer_find );
449
446
447
+ #if MICROPY_CPYTHON_COMPAT
450
448
STATIC mp_obj_t buffer_rfind (size_t n_args , const mp_obj_t * args ) {
451
449
return buffer_finder (n_args , args , -1 , false);
452
450
}
@@ -461,6 +459,7 @@ STATIC mp_obj_t buffer_rindex(size_t n_args, const mp_obj_t *args) {
461
459
return buffer_finder (n_args , args , -1 , true);
462
460
}
463
461
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN (buffer_rindex_obj , 2 , 4 , buffer_rindex );
462
+ #endif
464
463
465
464
#endif
466
465
@@ -646,11 +645,11 @@ STATIC const mp_rom_map_elem_t bytearray_locals_dict_table[] = {
646
645
{ MP_ROM_QSTR (MP_QSTR_extend ), MP_ROM_PTR (& array_extend_obj ) },
647
646
648
647
{ MP_ROM_QSTR (MP_QSTR_find ), MP_ROM_PTR (& buffer_find_obj ) },
648
+ #if MICROPY_CPYTHON_COMPAT
649
649
{ MP_ROM_QSTR (MP_QSTR_rfind ), MP_ROM_PTR (& buffer_rfind_obj ) },
650
650
{ MP_ROM_QSTR (MP_QSTR_index ), MP_ROM_PTR (& buffer_index_obj ) },
651
651
{ MP_ROM_QSTR (MP_QSTR_rindex ), MP_ROM_PTR (& buffer_rindex_obj ) },
652
652
653
- #if MICROPY_CPYTHON_COMPAT
654
653
{ MP_ROM_QSTR (MP_QSTR_decode ), MP_ROM_PTR (& array_decode_obj ) },
655
654
#endif
656
655
};
0 commit comments