updates to remove CP 6 fallback

Author: FoamyGuy

adafruit_turtle.py

@@ -641,12 +641,6 @@ def stamp(self, bitmap=None, palette=None):
         turtle position. Return a stamp_id for that stamp, which can be used to
         delete it by calling clearstamp(stamp_id).
         """
-        # The restriction on max_size in displayio.Group has been removed.
-        # For now, leave this with a limit of 6 so as not to break any
-        # deployed code.
-        if len(self._fg_addon_group) >= 6:
-            print("Addon group full")
-            return -1
         s_id = len(self._stamps)
         if self._turtle_pic is None:
             # easy.
@@ -660,11 +654,7 @@ def stamp(self, bitmap=None, palette=None):
             # odb bitmap
             new_stamp = displayio.TileGrid(
                 self._turtle_odb,
-                pixel_shader=getattr(
-                    self._turtle_odb, "pixel_shader", displayio.ColorConverter()
-                ),
-                # TODO: Once CP6 is no longer supported, replace the above line with below
-                # pixel_shader=self._turtle_odb.pixel_shader,
+                pixel_shader=self._turtle_odb.pixel_shader,
                 x=int(self._x - self._turtle_odb.width // 2),
                 y=int(self._y - self._turtle_odb.height // 2),
             )
@@ -974,13 +964,11 @@ def bgpic(self, picname=None):
                 self._bg_pic = None
                 self._bg_pic_filename = ""
         else:
-            with open(picname, "rb") as self._bg_pic:
-                odb = displayio.OnDiskBitmap(self._bg_pic)
+            odb = displayio.OnDiskBitmap(picname)
+
             self._odb_tilegrid = displayio.TileGrid(
                 odb,
-                pixel_shader=getattr(odb, "pixel_shader", displayio.ColorConverter()),
-                # TODO: Once CP6 is no longer supported, replace the above line with below
-                # pixel_shader=odb.pixel_shader,
+                pixel_shader=odb.pixel_shader,
             )
             self._bg_addon_group.append(self._odb_tilegrid)
             self._bg_pic_filename = picname
@@ -1103,11 +1091,7 @@ def changeturtle(self, source=None, dimensions=(12, 12)):
             self._turtle_pic = True
             self._turtle_alt_sprite = displayio.TileGrid(
                 self._turtle_odb,
-                pixel_shader=getattr(
-                    self._turtle_odb, "pixel_shader", displayio.ColorConverter()
-                ),
-                # TODO: Once CP6 is no longer supported, replace the above line with below
-                # pixel_shader=self._turtle_odb.pixel_shader,
+                pixel_shader=self._turtle_odb.pixel_shader,
             )
 
             if self._turtle_group: