Skip to content

Commit a45de19

Browse files
committed
use validate_int_range(). remove string translation entry
1 parent 692492f commit a45de19

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

locale/circuitpython.pot

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3687,10 +3687,6 @@ msgstr ""
36873687
msgid "palette must be 32 bytes long"
36883688
msgstr ""
36893689

3690-
#: shared-bindings/displayio/Palette.c
3691-
msgid "palette_index out of bounds"
3692-
msgstr ""
3693-
36943690
#: shared-bindings/displayio/Palette.c
36953691
msgid "palette_index should be an int"
36963692
msgstr ""

shared-bindings/displayio/Palette.c

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,7 @@ STATIC mp_obj_t displayio_palette_obj_make_transparent(mp_obj_t self_in, mp_obj_
160160
if (!mp_obj_get_int_maybe(palette_index_obj, &palette_index)) {
161161
mp_raise_ValueError(translate("palette_index should be an int"));
162162
}
163-
if (palette_index < 0 || (unsigned)palette_index >= common_hal_displayio_palette_get_len(self)) {
164-
mp_raise_IndexError(translate("palette_index out of bounds"));
165-
}
163+
palette_index = mp_arg_validate_int_range(palette_index, 0, common_hal_displayio_palette_get_len(self) - 1, MP_QSTR_palette_index);
166164

167165
common_hal_displayio_palette_make_transparent(self, palette_index);
168166
return mp_const_none;
@@ -179,9 +177,7 @@ STATIC mp_obj_t displayio_palette_obj_make_opaque(mp_obj_t self_in, mp_obj_t pal
179177
if (!mp_obj_get_int_maybe(palette_index_obj, &palette_index)) {
180178
mp_raise_ValueError(translate("palette_index should be an int"));
181179
}
182-
if (palette_index < 0 || (unsigned)palette_index >= common_hal_displayio_palette_get_len(self)) {
183-
mp_raise_IndexError(translate("palette_index out of bounds"));
184-
}
180+
palette_index = mp_arg_validate_int_range(palette_index, 0, common_hal_displayio_palette_get_len(self) - 1, MP_QSTR_palette_index);
185181

186182
common_hal_displayio_palette_make_opaque(self, palette_index);
187183
return mp_const_none;
@@ -199,9 +195,7 @@ STATIC mp_obj_t displayio_palette_obj_is_transparent(mp_obj_t self_in, mp_obj_t
199195
if (!mp_obj_get_int_maybe(palette_index_obj, &palette_index)) {
200196
mp_raise_ValueError(translate("palette_index should be an int"));
201197
}
202-
if (palette_index < 0 || (unsigned)palette_index >= common_hal_displayio_palette_get_len(self)) {
203-
mp_raise_IndexError(translate("palette_index out of bounds"));
204-
}
198+
palette_index = mp_arg_validate_int_range(palette_index, 0, common_hal_displayio_palette_get_len(self) - 1, MP_QSTR_palette_index);
205199

206200
return mp_obj_new_bool(common_hal_displayio_palette_is_transparent(self, palette_index));
207201
}

0 commit comments

Comments
 (0)