Skip to content

Commit 900edb2

Browse files
committed
Only add .find without CPYTHON_COMPAT
1 parent 6ac2fe5 commit 900edb2

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

py/objarray.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -412,10 +412,7 @@ STATIC mp_obj_t buffer_finder(size_t n_args, const mp_obj_t *args, int direction
412412
mp_get_buffer_raise(args[1], &needle_bufinfo, MP_BUFFER_READ);
413413

414414
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"));
419416
}
420417

421418
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) {
447444
}
448445
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(buffer_find_obj, 2, 4, buffer_find);
449446

447+
#if MICROPY_CPYTHON_COMPAT
450448
STATIC mp_obj_t buffer_rfind(size_t n_args, const mp_obj_t *args) {
451449
return buffer_finder(n_args, args, -1, false);
452450
}
@@ -461,6 +459,7 @@ STATIC mp_obj_t buffer_rindex(size_t n_args, const mp_obj_t *args) {
461459
return buffer_finder(n_args, args, -1, true);
462460
}
463461
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(buffer_rindex_obj, 2, 4, buffer_rindex);
462+
#endif
464463

465464
#endif
466465

@@ -646,11 +645,11 @@ STATIC const mp_rom_map_elem_t bytearray_locals_dict_table[] = {
646645
{ MP_ROM_QSTR(MP_QSTR_extend), MP_ROM_PTR(&array_extend_obj) },
647646

648647
{ MP_ROM_QSTR(MP_QSTR_find), MP_ROM_PTR(&buffer_find_obj) },
648+
#if MICROPY_CPYTHON_COMPAT
649649
{ MP_ROM_QSTR(MP_QSTR_rfind), MP_ROM_PTR(&buffer_rfind_obj) },
650650
{ MP_ROM_QSTR(MP_QSTR_index), MP_ROM_PTR(&buffer_index_obj) },
651651
{ MP_ROM_QSTR(MP_QSTR_rindex), MP_ROM_PTR(&buffer_rindex_obj) },
652652

653-
#if MICROPY_CPYTHON_COMPAT
654653
{ MP_ROM_QSTR(MP_QSTR_decode), MP_ROM_PTR(&array_decode_obj) },
655654
#endif
656655
};

0 commit comments

Comments
 (0)