TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py/objrange: Match CPython range slicing.

Browse Source 
The "index fixing" behavior of get_fast_slice_indexes are not desired here;
the underlying behavior of mp_obj_slice_indexes actually is.

Fixes issue #17016.

Signed-off-by: Jeff Epler <jepler@gmail.com>
This commit is contained in:
Jeff Epler
2025-03-27 21:29:01 -05:00
committed by Damien George
parent 760b962924
commit 8faa6bafdc
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
py/objrange.c
View File

@@ -164,15 +164,11 @@ static mp_obj_t range_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
#if MICROPY_PY_BUILTINS_SLICE #if MICROPY_PY_BUILTINS_SLICE
if (mp_obj_is_type(index, &mp_type_slice)) { if (mp_obj_is_type(index, &mp_type_slice)) {
mp_bound_slice_t slice; mp_bound_slice_t slice;
mp_seq_get_fast_slice_indexes(len, index, &slice); mp_obj_slice_indices(index, len, &slice);
mp_obj_range_t *o = mp_obj_malloc(mp_obj_range_t, &mp_type_range); mp_obj_range_t *o = mp_obj_malloc(mp_obj_range_t, &mp_type_range);
o->start = self->start + slice.start * self->step; o->start = self->start + slice.start * self->step;
o->stop = self->start + slice.stop * self->step; o->stop = self->start + slice.stop * self->step;
o->step = slice.step * self->step; o->step = slice.step * self->step;
if (slice.step < 0) {
// Negative slice steps have inclusive stop, so adjust for exclusive
o->stop -= self->step;
}
return MP_OBJ_FROM_PTR(o); return MP_OBJ_FROM_PTR(o);
} }
#endif #endif