Merge pull request #8125 from radarhere/type_hint

Added type hints
This commit is contained in:
Andrew Murray 2024-06-11 06:50:40 +10:00 committed by GitHub
commit 9a8759d91b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
30 changed files with 106 additions and 81 deletions

View File

@ -31,6 +31,7 @@ BLP files come in many different flavours:
from __future__ import annotations from __future__ import annotations
import abc
import os import os
import struct import struct
from enum import IntEnum from enum import IntEnum
@ -276,7 +277,7 @@ class BlpImageFile(ImageFile.ImageFile):
class _BLPBaseDecoder(ImageFile.PyDecoder): class _BLPBaseDecoder(ImageFile.PyDecoder):
_pulls_fd = True _pulls_fd = True
def decode(self, buffer): def decode(self, buffer: bytes) -> tuple[int, int]:
try: try:
self._read_blp_header() self._read_blp_header()
self._load() self._load()
@ -285,6 +286,10 @@ class _BLPBaseDecoder(ImageFile.PyDecoder):
raise OSError(msg) from e raise OSError(msg) from e
return -1, 0 return -1, 0
@abc.abstractmethod
def _load(self) -> None:
pass
def _read_blp_header(self) -> None: def _read_blp_header(self) -> None:
assert self.fd is not None assert self.fd is not None
self.fd.seek(4) self.fd.seek(4)
@ -318,7 +323,7 @@ class _BLPBaseDecoder(ImageFile.PyDecoder):
ret.append((b, g, r, a)) ret.append((b, g, r, a))
return ret return ret
def _read_bgra(self, palette): def _read_bgra(self, palette: list[tuple[int, int, int, int]]) -> bytearray:
data = bytearray() data = bytearray()
_data = BytesIO(self._safe_read(self._blp_lengths[0])) _data = BytesIO(self._safe_read(self._blp_lengths[0]))
while True: while True:
@ -327,7 +332,7 @@ class _BLPBaseDecoder(ImageFile.PyDecoder):
except struct.error: except struct.error:
break break
b, g, r, a = palette[offset] b, g, r, a = palette[offset]
d = (r, g, b) d: tuple[int, ...] = (r, g, b)
if self._blp_alpha_depth: if self._blp_alpha_depth:
d += (a,) d += (a,)
data.extend(d) data.extend(d)
@ -431,7 +436,7 @@ class BLPEncoder(ImageFile.PyEncoder):
data += b"\x00" * 4 data += b"\x00" * 4
return data return data
def encode(self, bufsize): def encode(self, bufsize: int) -> tuple[int, int, bytes]:
palette_data = self._write_palette() palette_data = self._write_palette()
offset = 20 + 16 * 4 * 2 + len(palette_data) offset = 20 + 16 * 4 * 2 + len(palette_data)
@ -449,7 +454,7 @@ class BLPEncoder(ImageFile.PyEncoder):
return len(data), 0, data return len(data), 0, data
def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
if im.mode != "P": if im.mode != "P":
msg = "Unsupported BLP image mode" msg = "Unsupported BLP image mode"
raise ValueError(msg) raise ValueError(msg)

View File

@ -395,12 +395,12 @@ SAVE = {
} }
def _dib_save(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _dib_save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
_save(im, fp, filename, False) _save(im, fp, filename, False)
def _save( def _save(
im: Image.Image, fp: IO[bytes], filename: str, bitmap_header: bool = True im: Image.Image, fp: IO[bytes], filename: str | bytes, bitmap_header: bool = True
) -> None: ) -> None:
try: try:
rawmode, bits, colors = SAVE[im.mode] rawmode, bits, colors = SAVE[im.mode]

View File

@ -60,7 +60,7 @@ class BufrStubImageFile(ImageFile.StubImageFile):
return _handler return _handler
def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
if _handler is None or not hasattr(_handler, "save"): if _handler is None or not hasattr(_handler, "save"):
msg = "BUFR save handler not installed" msg = "BUFR save handler not installed"
raise OSError(msg) raise OSError(msg)

View File

@ -511,7 +511,7 @@ class DdsRgbDecoder(ImageFile.PyDecoder):
return -1, 0 return -1, 0
def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
if im.mode not in ("RGB", "RGBA", "L", "LA"): if im.mode not in ("RGB", "RGBA", "L", "LA"):
msg = f"cannot write mode {im.mode} as DDS" msg = f"cannot write mode {im.mode} as DDS"
raise OSError(msg) raise OSError(msg)

View File

@ -715,12 +715,12 @@ def _write_multiple_frames(im, fp, palette):
return True return True
def _save_all(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
_save(im, fp, filename, save_all=True) _save(im, fp, filename, save_all=True)
def _save( def _save(
im: Image.Image, fp: IO[bytes], filename: str, save_all: bool = False im: Image.Image, fp: IO[bytes], filename: str | bytes, save_all: bool = False
) -> None: ) -> None:
# header # header
if "palette" in im.encoderinfo or "palette" in im.info: if "palette" in im.encoderinfo or "palette" in im.info:
@ -796,7 +796,7 @@ def _write_local_header(fp, im, offset, flags):
fp.write(o8(8)) # bits fp.write(o8(8)) # bits
def _save_netpbm(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save_netpbm(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
# Unused by default. # Unused by default.
# To use, uncomment the register_save call at the end of the file. # To use, uncomment the register_save call at the end of the file.
# #

View File

@ -60,7 +60,7 @@ class GribStubImageFile(ImageFile.StubImageFile):
return _handler return _handler
def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
if _handler is None or not hasattr(_handler, "save"): if _handler is None or not hasattr(_handler, "save"):
msg = "GRIB save handler not installed" msg = "GRIB save handler not installed"
raise OSError(msg) raise OSError(msg)

View File

@ -60,7 +60,7 @@ class HDF5StubImageFile(ImageFile.StubImageFile):
return _handler return _handler
def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
if _handler is None or not hasattr(_handler, "save"): if _handler is None or not hasattr(_handler, "save"):
msg = "HDF5 save handler not installed" msg = "HDF5 save handler not installed"
raise OSError(msg) raise OSError(msg)

View File

@ -22,6 +22,7 @@ import io
import os import os
import struct import struct
import sys import sys
from typing import IO
from . import Image, ImageFile, PngImagePlugin, features from . import Image, ImageFile, PngImagePlugin, features
@ -312,7 +313,7 @@ class IcnsImageFile(ImageFile.ImageFile):
return px return px
def _save(im, fp, filename): def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
""" """
Saves the image as a series of PNG files, Saves the image as a series of PNG files,
that are then combined into a .icns file. that are then combined into a .icns file.
@ -346,29 +347,27 @@ def _save(im, fp, filename):
entries = [] entries = []
for type, size in sizes.items(): for type, size in sizes.items():
stream = size_streams[size] stream = size_streams[size]
entries.append( entries.append((type, HEADERSIZE + len(stream), stream))
{"type": type, "size": HEADERSIZE + len(stream), "stream": stream}
)
# Header # Header
fp.write(MAGIC) fp.write(MAGIC)
file_length = HEADERSIZE # Header file_length = HEADERSIZE # Header
file_length += HEADERSIZE + 8 * len(entries) # TOC file_length += HEADERSIZE + 8 * len(entries) # TOC
file_length += sum(entry["size"] for entry in entries) file_length += sum(entry[1] for entry in entries)
fp.write(struct.pack(">i", file_length)) fp.write(struct.pack(">i", file_length))
# TOC # TOC
fp.write(b"TOC ") fp.write(b"TOC ")
fp.write(struct.pack(">i", HEADERSIZE + len(entries) * HEADERSIZE)) fp.write(struct.pack(">i", HEADERSIZE + len(entries) * HEADERSIZE))
for entry in entries: for entry in entries:
fp.write(entry["type"]) fp.write(entry[0])
fp.write(struct.pack(">i", entry["size"])) fp.write(struct.pack(">i", entry[1]))
# Data # Data
for entry in entries: for entry in entries:
fp.write(entry["type"]) fp.write(entry[0])
fp.write(struct.pack(">i", entry["size"])) fp.write(struct.pack(">i", entry[1]))
fp.write(entry["stream"]) fp.write(entry[2])
if hasattr(fp, "flush"): if hasattr(fp, "flush"):
fp.flush() fp.flush()

View File

@ -40,7 +40,7 @@ from ._binary import o32le as o32
_MAGIC = b"\0\0\1\0" _MAGIC = b"\0\0\1\0"
def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
fp.write(_MAGIC) # (2+2) fp.write(_MAGIC) # (2+2)
bmp = im.encoderinfo.get("bitmap_format") == "bmp" bmp = im.encoderinfo.get("bitmap_format") == "bmp"
sizes = im.encoderinfo.get( sizes = im.encoderinfo.get(

View File

@ -326,7 +326,7 @@ SAVE = {
} }
def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
try: try:
image_type, rawmode = SAVE[im.mode] image_type, rawmode = SAVE[im.mode]
except KeyError as e: except KeyError as e:
@ -341,6 +341,8 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None:
# or: SyntaxError("not an IM file") # or: SyntaxError("not an IM file")
# 8 characters are used for "Name: " and "\r\n" # 8 characters are used for "Name: " and "\r\n"
# Keep just the filename, ditch the potentially overlong path # Keep just the filename, ditch the potentially overlong path
if isinstance(filename, bytes):
filename = filename.decode("ascii")
name, ext = os.path.splitext(os.path.basename(filename)) name, ext = os.path.splitext(os.path.basename(filename))
name = "".join([name[: 92 - len(ext)], ext]) name = "".join([name[: 92 - len(ext)], ext])

View File

@ -626,7 +626,7 @@ class Image:
self.load() self.load()
def _dump( def _dump(
self, file: str | None = None, format: str | None = None, **options self, file: str | None = None, format: str | None = None, **options: Any
) -> str: ) -> str:
suffix = "" suffix = ""
if format: if format:
@ -649,10 +649,12 @@ class Image:
return filename return filename
def __eq__(self, other): def __eq__(self, other: object) -> bool:
if self.__class__ is not other.__class__:
return False
assert isinstance(other, Image)
return ( return (
self.__class__ is other.__class__ self.mode == other.mode
and self.mode == other.mode
and self.size == other.size and self.size == other.size
and self.info == other.info and self.info == other.info
and self.getpalette() == other.getpalette() and self.getpalette() == other.getpalette()
@ -2965,7 +2967,7 @@ class ImageTransformHandler:
# Debugging # Debugging
def _wedge(): def _wedge() -> Image:
"""Create grayscale wedge (for debugging only)""" """Create grayscale wedge (for debugging only)"""
return Image()._new(core.wedge("L")) return Image()._new(core.wedge("L"))
@ -3566,7 +3568,9 @@ def register_mime(id: str, mimetype: str) -> None:
MIME[id.upper()] = mimetype MIME[id.upper()] = mimetype
def register_save(id: str, driver) -> None: def register_save(
id: str, driver: Callable[[Image, IO[bytes], str | bytes], None]
) -> None:
""" """
Registers an image save function. This function should not be Registers an image save function. This function should not be
used in application code. used in application code.
@ -3577,7 +3581,9 @@ def register_save(id: str, driver) -> None:
SAVE[id.upper()] = driver SAVE[id.upper()] = driver
def register_save_all(id: str, driver) -> None: def register_save_all(
id: str, driver: Callable[[Image, IO[bytes], str | bytes], None]
) -> None:
""" """
Registers an image function to save all the frames Registers an image function to save all the frames
of a multiframe format. This function should not be of a multiframe format. This function should not be
@ -3651,7 +3657,7 @@ def register_encoder(name: str, encoder: type[ImageFile.PyEncoder]) -> None:
# Simple display support. # Simple display support.
def _show(image, **options) -> None: def _show(image: Image, **options: Any) -> None:
from . import ImageShow from . import ImageShow
ImageShow.show(image, **options) ImageShow.show(image, **options)
@ -3661,7 +3667,9 @@ def _show(image, **options) -> None:
# Effects # Effects
def effect_mandelbrot(size, extent, quality): def effect_mandelbrot(
size: tuple[int, int], extent: tuple[int, int, int, int], quality: int
) -> Image:
""" """
Generate a Mandelbrot set covering the given extent. Generate a Mandelbrot set covering the given extent.

View File

@ -219,7 +219,9 @@ class ImageDraw:
# This is a straight line, so no joint is required # This is a straight line, so no joint is required
continue continue
def coord_at_angle(coord, angle): def coord_at_angle(
coord: Sequence[float], angle: float
) -> tuple[float, float]:
x, y = coord x, y = coord
angle -= 90 angle -= 90
distance = width / 2 - 1 distance = width / 2 - 1
@ -1109,11 +1111,13 @@ def _compute_regular_polygon_vertices(
return [_compute_polygon_vertex(angle) for angle in angles] return [_compute_polygon_vertex(angle) for angle in angles]
def _color_diff(color1, color2: float | tuple[int, ...]) -> float: def _color_diff(
color1: float | tuple[int, ...], color2: float | tuple[int, ...]
) -> float:
""" """
Uses 1-norm distance to calculate difference between two values. Uses 1-norm distance to calculate difference between two values.
""" """
if isinstance(color2, tuple): first = color1 if isinstance(color1, tuple) else (color1,)
return sum(abs(color1[i] - color2[i]) for i in range(0, len(color2))) second = color2 if isinstance(color2, tuple) else (color2,)
else:
return abs(color1 - color2) return sum(abs(first[i] - second[i]) for i in range(0, len(second)))

View File

@ -763,7 +763,7 @@ class PyEncoder(PyCodec):
def pushes_fd(self): def pushes_fd(self):
return self._pushes_fd return self._pushes_fd
def encode(self, bufsize): def encode(self, bufsize: int) -> tuple[int, int, bytes]:
""" """
Override to perform the encoding process. Override to perform the encoding process.

View File

@ -329,11 +329,13 @@ def _accept(prefix: bytes) -> bool:
# Save support # Save support
def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
# Get the keyword arguments # Get the keyword arguments
info = im.encoderinfo info = im.encoderinfo
if filename.endswith(".j2k") or info.get("no_jp2", False): if isinstance(filename, str):
filename = filename.encode()
if filename.endswith(b".j2k") or info.get("no_jp2", False):
kind = "j2k" kind = "j2k"
else: else:
kind = "jp2" kind = "jp2"

View File

@ -42,7 +42,7 @@ import subprocess
import sys import sys
import tempfile import tempfile
import warnings import warnings
from typing import Any from typing import IO, Any
from . import Image, ImageFile from . import Image, ImageFile
from ._binary import i16be as i16 from ._binary import i16be as i16
@ -644,7 +644,7 @@ def get_sampling(im):
return samplings.get(sampling, -1) return samplings.get(sampling, -1)
def _save(im, fp, filename): def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
if im.width == 0 or im.height == 0: if im.width == 0 or im.height == 0:
msg = "cannot write empty image as JPEG" msg = "cannot write empty image as JPEG"
raise ValueError(msg) raise ValueError(msg)
@ -827,7 +827,7 @@ def _save(im, fp, filename):
ImageFile._save(im, fp, [("jpeg", (0, 0) + im.size, 0, rawmode)], bufsize) ImageFile._save(im, fp, [("jpeg", (0, 0) + im.size, 0, rawmode)], bufsize)
def _save_cjpeg(im, fp, filename): def _save_cjpeg(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
# ALTERNATIVE: handle JPEGs via the IJG command line utilities. # ALTERNATIVE: handle JPEGs via the IJG command line utilities.
tempfile = im._dump() tempfile = im._dump()
subprocess.check_call(["cjpeg", "-outfile", filename, tempfile]) subprocess.check_call(["cjpeg", "-outfile", filename, tempfile])

View File

@ -33,7 +33,7 @@ from . import (
from ._binary import o32le from ._binary import o32le
def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
JpegImagePlugin._save(im, fp, filename) JpegImagePlugin._save(im, fp, filename)

View File

@ -164,7 +164,7 @@ Image.register_decoder("MSP", MspDecoder)
# write MSP files (uncompressed only) # write MSP files (uncompressed only)
def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
if im.mode != "1": if im.mode != "1":
msg = f"cannot write mode {im.mode} as MSP" msg = f"cannot write mode {im.mode} as MSP"
raise OSError(msg) raise OSError(msg)

View File

@ -144,7 +144,7 @@ SAVE = {
} }
def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
try: try:
version, bits, planes, rawmode = SAVE[im.mode] version, bits, planes, rawmode = SAVE[im.mode]
except KeyError as e: except KeyError as e:

View File

@ -40,7 +40,7 @@ from . import Image, ImageFile, ImageSequence, PdfParser, __version__, features
# 5. page contents # 5. page contents
def _save_all(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
_save(im, fp, filename, save_all=True) _save(im, fp, filename, save_all=True)

View File

@ -76,7 +76,7 @@ class PdfFormatError(RuntimeError):
pass pass
def check_format_condition(condition, error_message): def check_format_condition(condition: bool, error_message: str) -> None:
if not condition: if not condition:
raise PdfFormatError(error_message) raise PdfFormatError(error_message)
@ -93,12 +93,11 @@ class IndirectReference(IndirectReferenceTuple):
def __bytes__(self) -> bytes: def __bytes__(self) -> bytes:
return self.__str__().encode("us-ascii") return self.__str__().encode("us-ascii")
def __eq__(self, other): def __eq__(self, other: object) -> bool:
return ( if self.__class__ is not other.__class__:
other.__class__ is self.__class__ return False
and other.object_id == self.object_id assert isinstance(other, IndirectReference)
and other.generation == self.generation return other.object_id == self.object_id and other.generation == self.generation
)
def __ne__(self, other): def __ne__(self, other):
return not (self == other) return not (self == other)

View File

@ -1234,7 +1234,7 @@ def _write_multiple_frames(im, fp, chunk, rawmode, default_image, append_images)
seq_num = fdat_chunks.seq_num seq_num = fdat_chunks.seq_num
def _save_all(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
_save(im, fp, filename, save_all=True) _save(im, fp, filename, save_all=True)

View File

@ -328,7 +328,7 @@ class PpmDecoder(ImageFile.PyDecoder):
# -------------------------------------------------------------------- # --------------------------------------------------------------------
def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
if im.mode == "1": if im.mode == "1":
rawmode, head = "1;I", b"P4" rawmode, head = "1;I", b"P4"
elif im.mode == "L": elif im.mode == "L":

View File

@ -37,6 +37,8 @@ class QoiImageFile(ImageFile.ImageFile):
class QoiDecoder(ImageFile.PyDecoder): class QoiDecoder(ImageFile.PyDecoder):
_pulls_fd = True _pulls_fd = True
_previous_pixel: bytes | bytearray | None = None
_previously_seen_pixels: dict[int, bytes | bytearray] = {}
def _add_to_previous_pixels(self, value: bytes | bytearray) -> None: def _add_to_previous_pixels(self, value: bytes | bytearray) -> None:
self._previous_pixel = value self._previous_pixel = value
@ -45,9 +47,10 @@ class QoiDecoder(ImageFile.PyDecoder):
hash_value = (r * 3 + g * 5 + b * 7 + a * 11) % 64 hash_value = (r * 3 + g * 5 + b * 7 + a * 11) % 64
self._previously_seen_pixels[hash_value] = value self._previously_seen_pixels[hash_value] = value
def decode(self, buffer): def decode(self, buffer: bytes) -> tuple[int, int]:
assert self.fd is not None
self._previously_seen_pixels = {} self._previously_seen_pixels = {}
self._previous_pixel = None
self._add_to_previous_pixels(bytearray((0, 0, 0, 255))) self._add_to_previous_pixels(bytearray((0, 0, 0, 255)))
data = bytearray() data = bytearray()
@ -55,7 +58,8 @@ class QoiDecoder(ImageFile.PyDecoder):
dest_length = self.state.xsize * self.state.ysize * bands dest_length = self.state.xsize * self.state.ysize * bands
while len(data) < dest_length: while len(data) < dest_length:
byte = self.fd.read(1)[0] byte = self.fd.read(1)[0]
if byte == 0b11111110: # QOI_OP_RGB value: bytes | bytearray
if byte == 0b11111110 and self._previous_pixel: # QOI_OP_RGB
value = bytearray(self.fd.read(3)) + self._previous_pixel[3:] value = bytearray(self.fd.read(3)) + self._previous_pixel[3:]
elif byte == 0b11111111: # QOI_OP_RGBA elif byte == 0b11111111: # QOI_OP_RGBA
value = self.fd.read(4) value = self.fd.read(4)
@ -66,7 +70,7 @@ class QoiDecoder(ImageFile.PyDecoder):
value = self._previously_seen_pixels.get( value = self._previously_seen_pixels.get(
op_index, bytearray((0, 0, 0, 0)) op_index, bytearray((0, 0, 0, 0))
) )
elif op == 1: # QOI_OP_DIFF elif op == 1 and self._previous_pixel: # QOI_OP_DIFF
value = bytearray( value = bytearray(
( (
(self._previous_pixel[0] + ((byte & 0b00110000) >> 4) - 2) (self._previous_pixel[0] + ((byte & 0b00110000) >> 4) - 2)
@ -77,7 +81,7 @@ class QoiDecoder(ImageFile.PyDecoder):
self._previous_pixel[3], self._previous_pixel[3],
) )
) )
elif op == 2: # QOI_OP_LUMA elif op == 2 and self._previous_pixel: # QOI_OP_LUMA
second_byte = self.fd.read(1)[0] second_byte = self.fd.read(1)[0]
diff_green = (byte & 0b00111111) - 32 diff_green = (byte & 0b00111111) - 32
diff_red = ((second_byte & 0b11110000) >> 4) - 8 diff_red = ((second_byte & 0b11110000) >> 4) - 8
@ -90,7 +94,7 @@ class QoiDecoder(ImageFile.PyDecoder):
) )
) )
value += self._previous_pixel[3:] value += self._previous_pixel[3:]
elif op == 3: # QOI_OP_RUN elif op == 3 and self._previous_pixel: # QOI_OP_RUN
run_length = (byte & 0b00111111) + 1 run_length = (byte & 0b00111111) + 1
value = self._previous_pixel value = self._previous_pixel
if bands == 3: if bands == 3:

View File

@ -125,7 +125,7 @@ class SgiImageFile(ImageFile.ImageFile):
] ]
def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
if im.mode not in {"RGB", "RGBA", "L"}: if im.mode not in {"RGB", "RGBA", "L"}:
msg = "Unsupported SGI image mode" msg = "Unsupported SGI image mode"
raise ValueError(msg) raise ValueError(msg)
@ -171,8 +171,9 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None:
# Maximum Byte value (255 = 8bits per pixel) # Maximum Byte value (255 = 8bits per pixel)
pinmax = 255 pinmax = 255
# Image name (79 characters max, truncated below in write) # Image name (79 characters max, truncated below in write)
filename = os.path.basename(filename) img_name = os.path.splitext(os.path.basename(filename))[0]
img_name = os.path.splitext(filename)[0].encode("ascii", "ignore") if isinstance(img_name, str):
img_name = img_name.encode("ascii", "ignore")
# Standard representation of pixel in the file # Standard representation of pixel in the file
colormap = 0 colormap = 0
fp.write(struct.pack(">h", magic_number)) fp.write(struct.pack(">h", magic_number))

View File

@ -263,7 +263,7 @@ def makeSpiderHeader(im: Image.Image) -> list[bytes]:
return [struct.pack("f", v) for v in hdr] return [struct.pack("f", v) for v in hdr]
def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
if im.mode[0] != "F": if im.mode[0] != "F":
im = im.convert("F") im = im.convert("F")
@ -279,9 +279,10 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None:
ImageFile._save(im, fp, [("raw", (0, 0) + im.size, 0, (rawmode, 0, 1))]) ImageFile._save(im, fp, [("raw", (0, 0) + im.size, 0, (rawmode, 0, 1))])
def _save_spider(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save_spider(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
# get the filename extension and register it with Image # get the filename extension and register it with Image
ext = os.path.splitext(filename)[1] filename_ext = os.path.splitext(filename)[1]
ext = filename_ext.decode() if isinstance(filename_ext, bytes) else filename_ext
Image.register_extension(SpiderImageFile.format, ext) Image.register_extension(SpiderImageFile.format, ext)
_save(im, fp, filename) _save(im, fp, filename)

View File

@ -178,7 +178,7 @@ SAVE = {
} }
def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
try: try:
rawmode, bits, colormaptype, imagetype = SAVE[im.mode] rawmode, bits, colormaptype, imagetype = SAVE[im.mode]
except KeyError as e: except KeyError as e:

View File

@ -387,7 +387,7 @@ class IFDRational(Rational):
def __hash__(self): def __hash__(self):
return self._val.__hash__() return self._val.__hash__()
def __eq__(self, other): def __eq__(self, other: object) -> bool:
val = self._val val = self._val
if isinstance(other, IFDRational): if isinstance(other, IFDRational):
other = other._val other = other._val
@ -2149,7 +2149,7 @@ class AppendingTiffWriter:
self.rewriteLastLong(offset) self.rewriteLastLong(offset)
def _save_all(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
encoderinfo = im.encoderinfo.copy() encoderinfo = im.encoderinfo.copy()
encoderconfig = im.encoderconfig encoderconfig = im.encoderconfig
append_images = list(encoderinfo.get("append_images", [])) append_images = list(encoderinfo.get("append_images", []))

View File

@ -1,7 +1,7 @@
from __future__ import annotations from __future__ import annotations
from io import BytesIO from io import BytesIO
from typing import Any from typing import IO, Any
from . import Image, ImageFile from . import Image, ImageFile
@ -182,7 +182,7 @@ class WebPImageFile(ImageFile.ImageFile):
return self.__logical_frame return self.__logical_frame
def _save_all(im, fp, filename): def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
encoderinfo = im.encoderinfo.copy() encoderinfo = im.encoderinfo.copy()
append_images = list(encoderinfo.get("append_images", [])) append_images = list(encoderinfo.get("append_images", []))
@ -195,7 +195,7 @@ def _save_all(im, fp, filename):
_save(im, fp, filename) _save(im, fp, filename)
return return
background = (0, 0, 0, 0) background: int | tuple[int, ...] = (0, 0, 0, 0)
if "background" in encoderinfo: if "background" in encoderinfo:
background = encoderinfo["background"] background = encoderinfo["background"]
elif "background" in im.info: elif "background" in im.info:
@ -325,7 +325,7 @@ def _save_all(im, fp, filename):
fp.write(data) fp.write(data)
def _save(im, fp, filename): def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
lossless = im.encoderinfo.get("lossless", False) lossless = im.encoderinfo.get("lossless", False)
quality = im.encoderinfo.get("quality", 80) quality = im.encoderinfo.get("quality", 80)
alpha_quality = im.encoderinfo.get("alpha_quality", 100) alpha_quality = im.encoderinfo.get("alpha_quality", 100)

View File

@ -163,7 +163,7 @@ class WmfStubImageFile(ImageFile.StubImageFile):
return super().load() return super().load()
def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
if _handler is None or not hasattr(_handler, "save"): if _handler is None or not hasattr(_handler, "save"):
msg = "WMF save handler not installed" msg = "WMF save handler not installed"
raise OSError(msg) raise OSError(msg)

View File

@ -70,7 +70,7 @@ class XbmImageFile(ImageFile.ImageFile):
self.tile = [("xbm", (0, 0) + self.size, m.end(), None)] self.tile = [("xbm", (0, 0) + self.size, m.end(), None)]
def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
if im.mode != "1": if im.mode != "1":
msg = f"cannot write mode {im.mode} as XBM" msg = f"cannot write mode {im.mode} as XBM"
raise OSError(msg) raise OSError(msg)