djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove redundant type check. remove blank line. revert locale change

Browse Source
This commit is contained in:
foamyguy 2022-04-19 09:07:35 -05:00
parent 459f896dd4
commit 6e3fe07943
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
locale/circuitpython.pot
View File

@ -2721,11 +2721,6 @@ msgstr ""
msgid "binary op %q not implemented" msgid "binary op %q not implemented"
msgstr "" msgstr ""
#: shared-bindings/displayio/TileGrid.c
msgid ""
"bitmap must be displayio.Bitmap, displayio.Shape, or displayio.OnDiskBitmap"
msgstr ""
#: shared-bindings/bitmaptools/__init__.c #: shared-bindings/bitmaptools/__init__.c
msgid "bitmap sizes must match" msgid "bitmap sizes must match"
msgstr "" msgstr ""
@ -3028,7 +3023,7 @@ msgstr ""
msgid "complex values not supported" msgid "complex values not supported"
msgstr "" msgstr ""
#: extmod/moduzlib.c #: extmod/moduzlib.c shared-module/zlib/DecompIO.c
msgid "compression header" msgid "compression header"
msgstr "" msgstr ""

7
shared-bindings/displayio/TileGrid.c
View File

@ -137,7 +137,6 @@ STATIC mp_obj_t displayio_tilegrid_make_new(const mp_obj_type_t *type, size_t n_
return MP_OBJ_FROM_PTR(self); return MP_OBJ_FROM_PTR(self);
} }
// Helper to ensure we have the native super class instead of a subclass. // Helper to ensure we have the native super class instead of a subclass.
static displayio_tilegrid_t *native_tilegrid(mp_obj_t tilegrid_obj) { static displayio_tilegrid_t *native_tilegrid(mp_obj_t tilegrid_obj) {
mp_obj_t native_tilegrid = mp_obj_cast_to_native_base(tilegrid_obj, &displayio_tilegrid_type); mp_obj_t native_tilegrid = mp_obj_cast_to_native_base(tilegrid_obj, &displayio_tilegrid_type);
@ -392,12 +391,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_bitmap_obj, displayio_tilegrid_
STATIC mp_obj_t displayio_tilegrid_obj_set_bitmap(mp_obj_t self_in, mp_obj_t bitmap) { STATIC mp_obj_t displayio_tilegrid_obj_set_bitmap(mp_obj_t self_in, mp_obj_t bitmap) {
displayio_tilegrid_t *self = native_tilegrid(self_in); displayio_tilegrid_t *self = native_tilegrid(self_in);
if (!mp_obj_is_type(bitmap, &displayio_bitmap_type) &&
!mp_obj_is_type(bitmap, &displayio_ondiskbitmap_type) &&
!mp_obj_is_type(bitmap, &displayio_shape_type)) {
mp_raise_TypeError(translate("bitmap must be displayio.Bitmap, displayio.Shape, or displayio.OnDiskBitmap"));
}
uint16_t new_bitmap_width; uint16_t new_bitmap_width;
uint16_t new_bitmap_height; uint16_t new_bitmap_height;