matplotlib
diff --git a/‎lib/matplotlib/ft2font.pyi‎
Lines changed: 58 additions & 31 deletions b/‎lib/matplotlib/ft2font.pyi‎
Lines changed: 58 additions & 31 deletions
diff --git a/‎lib/matplotlib/tests/test_ft2font.py‎
Lines changed: 4 additions & 2 deletions b/‎lib/matplotlib/tests/test_ft2font.py‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎src/ft2font.h‎
Lines changed: 0 additions & 3 deletions b/‎src/ft2font.h‎
Lines changed: 0 additions & 3 deletions
@@ -160,27 +160,6 @@ class _SfntPcltDict(TypedDict):
 
 @final
 class FT2Font:
-    ascender: int
-    bbox: tuple[int, int, int, int]
-    descender: int
-    face_flags: int
-    family_name: str
-    fname: str
-    height: int
-    max_advance_height: int
-    max_advance_width: int
-    num_charmaps: int
-    num_faces: int
-    num_fixed_sizes: int
-    num_glyphs: int
-    postscript_name: str
-    scalable: bool
-    style_flags: int
-    style_name: str
-    underline_position: int
-    underline_thickness: int
-    units_per_EM: int
-
     def __init__(
         self,
         filename: str | BinaryIO,
@@ -232,6 +211,46 @@ class FT2Font:
     def set_text(
         self, string: str, angle: float = ..., flags: int = ...
     ) -> NDArray[np.float64]: ...
+    @property
+    def ascender(self) -> int: ...
+    @property
+    def bbox(self) -> tuple[int, int, int, int]: ...
+    @property
+    def descender(self) -> int: ...
+    @property
+    def face_flags(self) -> int: ...
+    @property
+    def family_name(self) -> str: ...
+    @property
+    def fname(self) -> str: ...
+    @property
+    def height(self) -> int: ...
+    @property
+    def max_advance_height(self) -> int: ...
+    @property
+    def max_advance_width(self) -> int: ...
+    @property
+    def num_charmaps(self) -> int: ...
+    @property
+    def num_faces(self) -> int: ...
+    @property
+    def num_fixed_sizes(self) -> int: ...
+    @property
+    def num_glyphs(self) -> int: ...
+    @property
+    def postscript_name(self) -> str: ...
+    @property
+    def scalable(self) -> bool: ...
+    @property
+    def style_flags(self) -> int: ...
+    @property
+    def style_name(self) -> str: ...
+    @property
+    def underline_position(self) -> int: ...
+    @property
+    def underline_thickness(self) -> int: ...
+    @property
+    def units_per_EM(self) -> int: ...
 
 @final
 class FT2Image:  # TODO: When updating mypy>=1.4, subclass from Buffer.
@@ -240,15 +259,23 @@ class FT2Image:  # TODO: When updating mypy>=1.4, subclass from Buffer.
 
 @final
 class Glyph:
-    width: int
-    height: int
-    horiBearingX: int
-    horiBearingY: int
-    horiAdvance: int
-    linearHoriAdvance: int
-    vertBearingX: int
-    vertBearingY: int
-    vertAdvance: int
-
+    @property
+    def width(self) -> int: ...
+    @property
+    def height(self) -> int: ...
+    @property
+    def horiBearingX(self) -> int: ...
+    @property
+    def horiBearingY(self) -> int: ...
+    @property
+    def horiAdvance(self) -> int: ...
+    @property
+    def linearHoriAdvance(self) -> int: ...
+    @property
+    def vertBearingX(self) -> int: ...
+    @property
+    def vertBearingY(self) -> int: ...
+    @property
+    def vertAdvance(self) -> int: ...
     @property
     def bbox(self) -> tuple[int, int, int, int]: ...
@@ -130,6 +130,8 @@ def test_ft2font_invalid_args(tmp_path):
     # filename argument.
     with pytest.raises(TypeError, match='to a font file or a binary-mode file object'):
         ft2font.FT2Font(None)
+    with pytest.raises(TypeError, match='to a font file or a binary-mode file object'):
+        ft2font.FT2Font(object())  # Not bytes or string, and has no read() method.
     file = tmp_path / 'invalid-font.ttf'
     file.write_text('This is not a valid font file.')
     with (pytest.raises(TypeError, match='to a font file or a binary-mode file object'),
@@ -145,7 +147,7 @@ def test_ft2font_invalid_args(tmp_path):
     file = fm.findfont('DejaVu Sans')
 
     # hinting_factor argument.
-    with pytest.raises(TypeError, match='cannot be interpreted as an integer'):
+    with pytest.raises(TypeError, match='incompatible constructor arguments'):
         ft2font.FT2Font(file, 1.3)
     with pytest.raises(ValueError, match='hinting_factor must be greater than 0'):
         ft2font.FT2Font(file, 0)
@@ -157,7 +159,7 @@ def test_ft2font_invalid_args(tmp_path):
         ft2font.FT2Font(file, _fallback_list=[0])  # type: ignore[list-item]
 
     # kerning_factor argument.
-    with pytest.raises(TypeError, match='cannot be interpreted as an integer'):
+    with pytest.raises(TypeError, match='incompatible constructor arguments'):
         ft2font.FT2Font(file, _kerning_factor=1.3)
 
 
 
@@ -6,9 +6,6 @@
 #ifndef MPL_FT2FONT_H
 #define MPL_FT2FONT_H
 
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
 #include <cstdint>
 #include <set>
 #include <string>