Merge pull request #7578 from radarhere/font

Handle pathlib.Path in FreeTypeFont

Tests/test_imagefont.py

@@ -4,6 +4,7 @@ import re
 import shutil
 import sys
 from io import BytesIO
+from pathlib import Path
 
 import pytest
 from packaging.version import parse as parse_version
@@ -76,8 +77,9 @@ def _render(font, layout_engine):
     return img
 
 
-def test_font_with_name(layout_engine):
+@pytest.mark.parametrize("font", (FONT_PATH, Path(FONT_PATH)))
-    _render(FONT_PATH, layout_engine)
+def test_font_with_name(layout_engine, font):
+    _render(font, layout_engine)
 
 
 def test_font_with_filelike(layout_engine):

docs/reference/ImageFont.rst

@@ -70,12 +70,14 @@ Methods
 Constants
 ---------
 
-.. data:: PIL.ImageFont.Layout.BASIC
+.. class:: Layout
+
+    .. py:attribute:: BASIC
 
         Use basic text layout for TrueType font.
         Advanced features such as text direction are not supported.
 
-.. data:: PIL.ImageFont.Layout.RAQM
+    .. py:attribute:: RAQM
 
         Use Raqm text layout for TrueType font.
         Advanced features are supported.
@@ -83,9 +85,6 @@ Constants
         Requires Raqm, you can check support using
         :py:func:`PIL.features.check_feature` with ``feature="raqm"``.
 
-Constants
----------
-
 .. data:: MAX_STRING_LENGTH
 
     Set to 1,000,000, to protect against potential DOS attacks. Pillow will

src/PIL/ImageFont.py

@@ -25,12 +25,16 @@
 # See the README file for information on usage and redistribution.
 #
 
+from __future__ import annotations
+
 import base64
 import os
 import sys
 import warnings
 from enum import IntEnum
 from io import BytesIO
+from pathlib import Path
+from typing import IO
 
 from . import Image
 from ._util import is_directory, is_path
@@ -185,7 +189,14 @@ class ImageFont:
 class FreeTypeFont:
     """FreeType font wrapper (requires _imagingft service)"""
 
-    def __init__(self, font=None, size=10, index=0, encoding="", layout_engine=None):
+    def __init__(
+        self,
+        font: bytes | str | Path | IO | None = None,
+        size: float = 10,
+        index: int = 0,
+        encoding: str = "",
+        layout_engine: Layout | None = None,
+    ) -> None:
         # FIXME: use service provider instead
 
         if size <= 0:
@@ -217,6 +228,8 @@ class FreeTypeFont:
             )
 
         if is_path(font):
+            if isinstance(font, Path):
+                font = str(font)
             if sys.platform == "win32":
                 font_bytes_path = font if isinstance(font, bytes) else font.encode()
                 try:
@@ -779,7 +792,7 @@ def truetype(font=None, size=10, index=0, encoding="", layout_engine=None):
                      This specifies the character set to use. It does not alter the
                      encoding of any text provided in subsequent operations.
     :param layout_engine: Which layout engine to use, if available:
-                     :data:`.ImageFont.Layout.BASIC` or :data:`.ImageFont.Layout.RAQM`.
+                     :attr:`.ImageFont.Layout.BASIC` or :attr:`.ImageFont.Layout.RAQM`.
                      If it is available, Raqm layout will be used by default.
                      Otherwise, basic layout will be used.