python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-03-03 11:35:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle pathlib.Path in FreeTypeFont

Browse Source
This commit is contained in:
Andrew Murray 2023-11-27 23:03:10 +11:00
parent f9c7bd8611
commit ae7958fa8d
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tests/test_imagefont.py
View File

@ -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):
_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):

3
src/PIL/ImageFont.py
View File

@ -31,6 +31,7 @@ import sys
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 @@ 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: