Skip to content

Commit

Permalink
Fix new Ruff errors
Browse files Browse the repository at this point in the history
  • Loading branch information
hugovk committed Dec 2, 2024
1 parent 0000729 commit 0ab21df
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 26 deletions.
2 changes: 1 addition & 1 deletion src/PIL/ImImagePlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
name = "".join([name[: 92 - len(ext)], ext])

fp.write(f"Name: {name}\r\n".encode("ascii"))
fp.write(("Image size (x*y): %d*%d\r\n" % im.size).encode("ascii"))
fp.write(f"Image size (x*y): {im.size[0]}*{im.size[1]}\r\n".encode("ascii"))

Check warning on line 360 in src/PIL/ImImagePlugin.py

View check run for this annotation

Codecov / codecov/patch

src/PIL/ImImagePlugin.py#L360

Added line #L360 was not covered by tests
fp.write(f"File size (no of images): {frames}\r\n".encode("ascii"))
if im.mode in ["P", "PA"]:
fp.write(b"Lut: 1\r\n")
Expand Down
21 changes: 6 additions & 15 deletions src/PIL/Image.py
Original file line number Diff line number Diff line change
Expand Up @@ -692,13 +692,10 @@ def __eq__(self, other: object) -> bool:
)

def __repr__(self) -> str:
return "<%s.%s image mode=%s size=%dx%d at 0x%X>" % (
self.__class__.__module__,
self.__class__.__name__,
self.mode,
self.size[0],
self.size[1],
id(self),
return (

Check warning on line 695 in src/PIL/Image.py

View check run for this annotation

Codecov / codecov/patch

src/PIL/Image.py#L695

Added line #L695 was not covered by tests
f"<{self.__class__.__module__}.{self.__class__.__name__} "
f"image mode={self.mode} size={self.size[0]}x{self.size[1]} "
f"at 0x{id(self):X}>"
)

def _repr_pretty_(self, p: PrettyPrinter, cycle: bool) -> None:
Expand All @@ -707,14 +704,8 @@ def _repr_pretty_(self, p: PrettyPrinter, cycle: bool) -> None:
# Same as __repr__ but without unpredictable id(self),
# to keep Jupyter notebook `text/plain` output stable.
p.text(
"<%s.%s image mode=%s size=%dx%d>"
% (
self.__class__.__module__,
self.__class__.__name__,
self.mode,
self.size[0],
self.size[1],
)
f"<{self.__class__.__module__}.{self.__class__.__name__} "
f"image mode={self.mode} size={self.size[0]}x{self.size[1]}>"
)

def _repr_image(self, image_format: str, **kwargs: Any) -> bytes | None:
Expand Down
2 changes: 1 addition & 1 deletion src/PIL/JpegImagePlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def APP(self: JpegImageFile, marker: int) -> None:
n = i16(self.fp.read(2)) - 2
s = ImageFile._safe_read(self.fp, n)

app = "APP%d" % (marker & 15)
app = f"APP{marker & 15}"

Check warning on line 75 in src/PIL/JpegImagePlugin.py

View check run for this annotation

Codecov / codecov/patch

src/PIL/JpegImagePlugin.py#L75

Added line #L75 was not covered by tests

self.app[app] = s # compatibility
self.applist.append((app, s))
Expand Down
2 changes: 1 addition & 1 deletion src/PIL/PcxImagePlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def _open(self) -> None:

elif bits == 1 and planes in (2, 4):
mode = "P"
rawmode = "P;%dL" % planes
rawmode = f"P;{planes}L"

Check warning on line 89 in src/PIL/PcxImagePlugin.py

View check run for this annotation

Codecov / codecov/patch

src/PIL/PcxImagePlugin.py#L89

Added line #L89 was not covered by tests
self.palette = ImagePalette.raw("RGB", s[16:64])

elif version == 5 and bits == 8 and planes == 1:
Expand Down
2 changes: 1 addition & 1 deletion src/PIL/PngImagePlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ def chunk_cHRM(self, pos: int, length: int) -> bytes:

assert self.fp is not None
s = ImageFile._safe_read(self.fp, length)
raw_vals = struct.unpack(">%dI" % (len(s) // 4), s)
raw_vals = struct.unpack(f">{len(s) // 4}I", s)

Check warning on line 526 in src/PIL/PngImagePlugin.py

View check run for this annotation

Codecov / codecov/patch

src/PIL/PngImagePlugin.py#L526

Added line #L526 was not covered by tests
self.im_info["chromaticity"] = tuple(elt / 100000.0 for elt in raw_vals)
return s

Expand Down
13 changes: 7 additions & 6 deletions src/PIL/TiffImagePlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -935,9 +935,9 @@ def load(self, fp: IO[bytes]) -> None:
self._tagdata[tag] = data
self.tagtype[tag] = typ

msg += " - value: " + (
"<table: %d bytes>" % size if size > 32 else repr(data)
)
bytes_value = size if size > 32 else repr(data)
msg += f" - value: <table: {bytes_value} bytes>"

Check warning on line 939 in src/PIL/TiffImagePlugin.py

View check run for this annotation

Codecov / codecov/patch

src/PIL/TiffImagePlugin.py#L938-L939

Added lines #L938 - L939 were not covered by tests

logger.debug(msg)

(self.next,) = (
Expand Down Expand Up @@ -981,9 +981,10 @@ def tobytes(self, offset: int = 0) -> bytes:

tagname = TiffTags.lookup(tag, self.group).name
typname = "ifd" if is_ifd else TYPES.get(typ, "unknown")
msg = f"save: {tagname} ({tag}) - type: {typname} ({typ})"
msg += " - value: " + (
"<table: %d bytes>" % len(data) if len(data) >= 16 else str(values)
bytes_value = len(data) if len(data) >= 16 else str(values)
msg = (

Check warning on line 985 in src/PIL/TiffImagePlugin.py

View check run for this annotation

Codecov / codecov/patch

src/PIL/TiffImagePlugin.py#L984-L985

Added lines #L984 - L985 were not covered by tests
f"save: {tagname} ({tag}) - type: {typname} ({typ})"
f" - value: <table: {bytes_value} bytes>"
)
logger.debug(msg)

Expand Down
2 changes: 1 addition & 1 deletion src/PIL/_typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def __class_getitem__(cls, item: Any) -> type[bool]:


class SupportsRead(Protocol[_T_co]):
def read(self, __length: int = ...) -> _T_co: ...
def read(self, length: int = ..., /) -> _T_co: ...


StrOrBytesPath = Union[str, bytes, os.PathLike[str], os.PathLike[bytes]]
Expand Down

0 comments on commit 0ab21df

Please sign in to comment.