Handle pathlib.Path in FreeTypeFont

python-pillow · Nov 27, 2023 · ae7958f · ae7958f
1 parent f9c7bd8
commit ae7958f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py
@@ -4,6 +4,7 @@
 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):
-    _render(FONT_PATH, layout_engine)
+@pytest.mark.parametrize("font", (FONT_PATH, Path(FONT_PATH)))
+def test_font_with_name(layout_engine, font):
+    _render(font, layout_engine)
 
 
 def test_font_with_filelike(layout_engine):

diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py
@@ -31,6 +31,7 @@
 import warnings
 from enum import IntEnum
 from io import BytesIO
+from pathlib import Path
 
 from . import Image
 from ._util import is_directory, is_path
@@ -213,6 +214,8 @@ def load_from_bytes(f):
             )
 
         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: