mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-02-04 05:34:36 +03:00
Merge pull request #112 from radarhere/type-hints-replace-io.BytesIO
This commit is contained in:
commit
958a651449
|
@ -2385,7 +2385,7 @@ class Image:
|
|||
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")
|
||||
|
|
|
@ -33,10 +33,10 @@ import sys
|
|||
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 @@ class FreeTypeFont:
|
|||
)
|
||||
|
||||
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:
|
||||
|
|
Loading…
Reference in New Issue
Block a user