remove type: ignore and minor refactor for dir/hasattr, swap WriteableBuffer #18

Author: matt-land

adafruit_bitmapsaver.py

@@ -35,23 +35,23 @@
 
 try:
     from typing import Tuple, Optional, Union
-    from io import BufferedWriter
+    from io import WriteableBuffer
 except ImportError:
     pass
 
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_BitmapSaver.git"
 
 
-def _write_bmp_header(output_file: BufferedWriter, filesize: int) -> None:
+def _write_bmp_header(output_file: WriteableBuffer, filesize: int) -> None:
     output_file.write(bytes("BM", "ascii"))
     output_file.write(struct.pack("<I", filesize))
     output_file.write(b"\00\x00")
     output_file.write(b"\00\x00")
     output_file.write(struct.pack("<I", 54))
 
 
-def _write_dib_header(output_file: BufferedWriter, width: int, height: int) -> None:
+def _write_dib_header(output_file: WriteableBuffer, width: int, height: int) -> None:
     output_file.write(struct.pack("<I", 40))
     output_file.write(struct.pack("<I", width))
     output_file.write(struct.pack("<I", height))
@@ -83,7 +83,7 @@ def _rgb565_to_bgr_tuple(color: int) -> Tuple[int, int, int]:
 
 # pylint:disable=too-many-locals
 def _write_pixels(
-    output_file: BufferedWriter,
+    output_file: WriteableBuffer,
     pixel_source: Union[Bitmap, Display],
     palette: Optional[Palette],
 ) -> None:
@@ -95,16 +95,16 @@ def _write_pixels(
         if saving_bitmap:
             # pixel_source: Bitmap
             for x in range(width):
-                pixel = pixel_source[x, y - 1]  # type: ignore
-                color = palette[pixel]  # type: ignore  # handled by save_pixel's guardians
+                pixel = pixel_source[x, y - 1]
+                color = palette[pixel]  # handled by save_pixel's guardians
                 for _ in range(3):
                     row_buffer[buffer_index] = color & 0xFF
                     color >>= 8
                     buffer_index += 1
         else:
             # pixel_source: Display
             result_buffer = bytearray(2048)
-            data = pixel_source.fill_row(y - 1, result_buffer)  # type: ignore
+            data = pixel_source.fill_row(y - 1, result_buffer)
             for i in range(width):
                 pixel565 = (data[i * 2] << 8) + data[i * 2 + 1]
                 for b in _rgb565_to_bgr_tuple(pixel565):
@@ -120,7 +120,7 @@ def _write_pixels(
 
 
 def save_pixels(
-    file_or_filename: Union[str, BufferedWriter],
+    file_or_filename: Union[str, WriteableBuffer],
     pixel_source: Union[Display, Bitmap] = None,
     palette: Palette = None,
 ) -> None:
@@ -133,7 +133,7 @@ def save_pixels(
     :param palette: the Palette to use for looking up colors in the bitmap
     """
     if not pixel_source:
-        if "DISPLAY" not in dir(board):
+        if not hasattr(board, "DISPLAY"):
             raise ValueError("Second argument must be a Bitmap or Display")
         pixel_source = board.DISPLAY