From 7936be32bc5066307c1721b57d4ff8ce6f9b1ff4 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Thu, 7 Nov 2024 16:43:40 -0600 Subject: [PATCH 1/2] show ColorConverter in type annotation --- adafruit_imageload/__init__.py | 4 ++-- adafruit_imageload/bmp/__init__.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/adafruit_imageload/__init__.py b/adafruit_imageload/__init__.py index bf7d3e2..e149c41 100644 --- a/adafruit_imageload/__init__.py +++ b/adafruit_imageload/__init__.py @@ -24,7 +24,7 @@ Union, ) - from displayio import Bitmap, Palette + from displayio import Bitmap, ColorConverter, Palette from .displayio_types import BitmapConstructor, PaletteConstructor except ImportError: @@ -39,7 +39,7 @@ def load( *, bitmap: Optional[BitmapConstructor] = None, palette: Optional[PaletteConstructor] = None, -) -> Tuple[Bitmap, Optional[Palette]]: +) -> Tuple[Bitmap, Optional[Union[Palette, ColorConverter]]]: """Load pixel values (indices or colors) into a bitmap and colors into a palette. bitmap is the desired type. It must take width, height and color_depth in the constructor. It diff --git a/adafruit_imageload/bmp/__init__.py b/adafruit_imageload/bmp/__init__.py index d7b9801..715e98b 100755 --- a/adafruit_imageload/bmp/__init__.py +++ b/adafruit_imageload/bmp/__init__.py @@ -15,9 +15,9 @@ try: from io import BufferedReader - from typing import List, Optional, Set, Tuple + from typing import List, Optional, Set, Tuple, Union - from displayio import Bitmap, Palette + from displayio import Bitmap, ColorConverter, Palette from ..displayio_types import BitmapConstructor, PaletteConstructor except ImportError: @@ -32,7 +32,7 @@ def load( *, bitmap: Optional[BitmapConstructor] = None, palette: Optional[PaletteConstructor] = None, -) -> Tuple[Optional[Bitmap], Optional[Palette]]: +) -> Tuple[Optional[Bitmap], Optional[Union[Palette, ColorConverter]]]: """Loads a bmp image from the open ``file``. Returns tuple of bitmap object and palette object. From 04bdc7d5103232cacc9ff7ec8b79d3094a371f12 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Thu, 7 Nov 2024 16:48:33 -0600 Subject: [PATCH 2/2] show ColorConverter in docstring --- adafruit_imageload/bmp/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adafruit_imageload/bmp/__init__.py b/adafruit_imageload/bmp/__init__.py index 715e98b..5c9c1df 100755 --- a/adafruit_imageload/bmp/__init__.py +++ b/adafruit_imageload/bmp/__init__.py @@ -35,7 +35,8 @@ def load( ) -> Tuple[Optional[Bitmap], Optional[Union[Palette, ColorConverter]]]: """Loads a bmp image from the open ``file``. - Returns tuple of bitmap object and palette object. + Returns tuple of `displayio.Bitmap` object and + `displayio.Palette` object, or `displayio.ColorConverter` object. :param io.BufferedReader file: Open file handle or compatible (like `io.BytesIO`) with the data of a BMP file.