Merge pull request #112 from radarhere/type-hints-replace-io.BytesIO

hugovk · Feb 10, 2024 · 958a651 · 958a651
2 parents 159fc06 + 152a24e
commit 958a651
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/PIL/Image.py b/src/PIL/Image.py
@@ -2385,7 +2385,7 @@ def save(self, fp, format=None, **params) -> None:
         filename = ""
         open_fp = False
         if is_path(fp):
-            filename = os.fspath(fp)
+            filename = os.path.realpath(os.fspath(fp))
             open_fp = True
         elif fp == sys.stdout:
             try:
@@ -3240,10 +3240,8 @@ def open(fp, mode="r", formats=None) -> Image:
 
     exclusive_fp = False
     filename = ""
-    if isinstance(fp, os.PathLike):
+    if is_path(fp):
         filename = os.path.realpath(os.fspath(fp))
-    elif is_path(fp):
-        filename = fp
 
     if filename:
         fp = builtins.open(filename, "rb")

diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py
@@ -33,10 +33,10 @@
 import warnings
 from enum import IntEnum
 from io import BytesIO
-from pathlib import Path
 from typing import BinaryIO
 
 from . import Image
+from ._typing import StrOrBytesPath
 from ._util import is_directory, is_path
 
 
@@ -193,7 +193,7 @@ class FreeTypeFont:
 
     def __init__(
         self,
-        font: bytes | str | Path | BinaryIO | None = None,
+        font: StrOrBytesPath | BinaryIO | None = None,
         size: float = 10,
         index: int = 0,
         encoding: str = "",
@@ -230,7 +230,7 @@ def load_from_bytes(f):
             )
 
         if is_path(font):
-            font = os.fspath(font)
+            font = os.path.realpath(os.fspath(font))
             if sys.platform == "win32":
                 font_bytes_path = font if isinstance(font, bytes) else font.encode()
                 try: