Adjust _imagingft.pyi to match reality

Author: akx

Tests/test_font_pcf_charsets.py

@@ -97,12 +97,12 @@ def test_textsize(
     tempname = save_font(request, tmp_path, encoding)
     font = ImageFont.load(tempname)
     for i in range(255):
-        ox, oy, dx, dy = font.getbbox(bytearray([i]))
+        ox, oy, dx, dy = font.getbbox(bytes([i]))
         assert ox == 0
         assert oy == 0
         assert dy == 20
         assert dx in (0, 10)
-        assert font.getlength(bytearray([i])) == dx
+        assert font.getlength(bytes([i])) == dx
     message = charsets[encoding]["message"].encode(encoding)
     for i in range(len(message)):
         msg = message[: i + 1]

src/PIL/ImageFont.py

@@ -74,7 +74,7 @@ class Layout(IntEnum):
     core = DeferredError.new(ex)
 
 
-def _string_length_check(text: str | bytes | bytearray) -> None:
+def _string_length_check(text: str | bytes) -> None:
     if MAX_STRING_LENGTH is not None and len(text) > MAX_STRING_LENGTH:
         msg = "too many characters in string"
         raise ValueError(msg)
@@ -101,7 +101,7 @@ class BaseImageFont(abc.ABC):
 
     @abc.abstractmethod
     def getbbox(
-        self, text: str | bytes | bytearray, *args: Any, **kwargs: Any
+        self, text: str | bytes, *args: Any, **kwargs: Any
     ) -> tuple[float, float, float, float]:
         pass
 
@@ -206,7 +206,7 @@ def getmask(
         return self.font.getmask(text, mode)
 
     def getbbox(
-        self, text: str | bytes | bytearray, *args: Any, **kwargs: Any
+        self, text: str | bytes, *args: Any, **kwargs: Any
     ) -> tuple[int, int, int, int]:
         """
         Returns bounding box (in pixels) of given text.
@@ -221,9 +221,7 @@ def getbbox(
         width, height = self.font.getsize(text)
         return 0, 0, width, height
 
-    def getlength(
-        self, text: str | bytes | bytearray, *args: Any, **kwargs: Any
-    ) -> int:
+    def getlength(self, text: str | bytes, *args: Any, **kwargs: Any) -> int:
         """
         Returns length (in pixels) of given text.
         This is the amount by which following text should be offset.
@@ -406,7 +404,7 @@ def getlength(
 
     def getbbox(
         self,
-        text: str | bytes | bytearray,
+        text: str | bytes,
         mode: str = "",
         direction: str | None = None,
         features: list[str] | None = None,
@@ -774,7 +772,7 @@ def getmask(
         return im
 
     def getbbox(
-        self, text: str | bytes | bytearray, *args: Any, **kwargs: Any
+        self, text: str | bytes, *args: Any, **kwargs: Any
     ) -> tuple[int, int, float, float]:
         # TransposedFont doesn't support getmask2, move top-left point to (0, 0)
         # this has no effect on ImageFont and simulates anchor="lt" for FreeTypeFont

src/PIL/_imagingft.pyi

@@ -24,34 +24,34 @@ class Font:
         self,
         string: str | bytes,
         fill: Callable[[int, int], _imaging.ImagingCore],
-        mode: str,
-        dir: str | None,
-        features: list[str] | None,
-        lang: str | None,
-        stroke_width: float,
-        stroke_filled: bool,
-        anchor: str | None,
-        foreground_ink_long: int,
-        start: tuple[float, float],
+        mode: str | None = ...,
+        dir: str | None = ...,
+        features: list[str] | None = ...,
+        lang: str | None = ...,
+        stroke_width: float = ...,
+        stroke_filled: bool = ...,
+        anchor: str | None = ...,
+        foreground_ink_long: int = ...,
+        start: tuple[float, float] = ...,
         /,
     ) -> tuple[_imaging.ImagingCore, tuple[int, int]]: ...
     def getsize(
         self,
-        string: str | bytes | bytearray,
-        mode: str,
-        dir: str | None,
-        features: list[str] | None,
-        lang: str | None,
-        anchor: str | None,
+        string: str | bytes,
+        mode: str | None = ...,
+        dir: str | None = ...,
+        features: list[str] | None = ...,
+        lang: str | None = ...,
+        anchor: str | None = ...,
         /,
     ) -> tuple[tuple[int, int], tuple[int, int]]: ...
     def getlength(
         self,
         string: str | bytes,
-        mode: str,
-        dir: str | None,
-        features: list[str] | None,
-        lang: str | None,
+        mode: str | None = ...,
+        dir: str | None = ...,
+        features: list[str] | None = ...,
+        lang: str | None = ...,
         /,
     ) -> int: ...
     def getvarnames(self) -> list[bytes]: ...