python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-08-18 19:24:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Convert font path on all platforms

Browse Source
This commit is contained in:
Andrew Murray 2021-08-01 14:58:03 +10:00 committed by Alexander Schlarb
parent 44c7fc9a23
commit 39f3913b9d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/test_imagefont.py
View File

@ -1,10 +1,10 @@
import copy import copy
from pathlib import Path
import os import os
import re import re
import shutil import shutil
import sys import sys
from io import BytesIO from io import BytesIO
from pathlib import Path
import pytest import pytest
from packaging.version import parse as parse_version from packaging.version import parse as parse_version

2
src/PIL/ImageFont.py
View File

@ -198,8 +198,8 @@ class FreeTypeFont:
) )
if isPath(font): if isPath(font):
if sys.platform == "win32":
font = os.fspath(font) font = os.fspath(font)
if sys.platform == "win32":
font_bytes_path = font if isinstance(font, bytes) else font.encode() font_bytes_path = font if isinstance(font, bytes) else font.encode()
try: try:
font_bytes_path.decode("ascii") font_bytes_path.decode("ascii")