python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-26 18:06:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix LOG011 avoid pre-formatting log messages

Browse Source
This commit is contained in:
Hugo van Kemenade 2023-09-09 14:03:39 +03:00
parent 9d104b241e
commit 507b7d519a
2 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/helper.py
View File

@ -91,7 +91,7 @@ def assert_image_equal(a, b, msg=None):
if HAS_UPLOADER: if HAS_UPLOADER:
try: try:
url = test_image_results.upload(a, b) url = test_image_results.upload(a, b)
logger.error(f"Url for test images: {url}") logger.error("URL for test images: %s", url)
except Exception: except Exception:
pass pass
@ -126,7 +126,7 @@ def assert_image_similar(a, b, epsilon, msg=None):
if HAS_UPLOADER: if HAS_UPLOADER:
try: try:
url = test_image_results.upload(a, b) url = test_image_results.upload(a, b)
logger.error(f"Url for test images: {url}") logger.error("URL for test images: %s", url)
except Exception: except Exception:
pass pass
raise e raise e

45
src/PIL/TiffImagePlugin.py
View File

@ -823,7 +823,7 @@ class ImageFileDirectory_v2(MutableMapping):
try: try:
unit_size, handler = self._load_dispatch[typ] unit_size, handler = self._load_dispatch[typ]
except KeyError: except KeyError:
logger.debug(msg + f" - unsupported type {typ}") logger.debug("%s - unsupported type %s", msg, typ)
continue # ignore unsupported type continue # ignore unsupported type
size = count * unit_size size = count * unit_size
if size > (8 if self._bigtiff else 4): if size > (8 if self._bigtiff else 4):
@ -880,7 +880,7 @@ class ImageFileDirectory_v2(MutableMapping):
if tag == STRIPOFFSETS: if tag == STRIPOFFSETS:
stripoffsets = len(entries) stripoffsets = len(entries)
typ = self.tagtype.get(tag) typ = self.tagtype.get(tag)
logger.debug(f"Tag {tag}, Type: {typ}, Value: {repr(value)}") logger.debug("Tag %s, Type: %s, Value: %s", tag, typ, repr(value))
is_ifd = typ == TiffTags.LONG and isinstance(value, dict) is_ifd = typ == TiffTags.LONG and isinstance(value, dict)
if is_ifd: if is_ifd:
if self._endian == "<": if self._endian == "<":
@ -929,7 +929,7 @@ class ImageFileDirectory_v2(MutableMapping):
# pass 2: write entries to file # pass 2: write entries to file
for tag, typ, count, value, data in entries: for tag, typ, count, value, data in entries:
logger.debug(f"{tag} {typ} {count} {repr(value)} {repr(data)}") logger.debug("%s %s %s %s %s", tag, typ, count, repr(value), repr(data))
result += self._pack("HHL4s", tag, typ, count, value) result += self._pack("HHL4s", tag, typ, count, value)
# -- overwrite here for multi-page -- # -- overwrite here for multi-page --
@ -1098,8 +1098,8 @@ class TiffImageFile(ImageFile.ImageFile):
self._n_frames = None self._n_frames = None
logger.debug("*** TiffImageFile._open ***") logger.debug("*** TiffImageFile._open ***")
logger.debug(f"- __first: {self.__first}") logger.debug("- __first: %s", self.__first)
logger.debug(f"- ifh: {repr(ifh)}") # Use repr to avoid str(bytes) logger.debug("- ifh: %s", repr(ifh)) # Use repr to avoid str(bytes)
# and load the first frame # and load the first frame
self._seek(0) self._seek(0)
@ -1137,12 +1137,15 @@ class TiffImageFile(ImageFile.ImageFile):
msg = "no more images in TIFF file" msg = "no more images in TIFF file"
raise EOFError(msg) raise EOFError(msg)
logger.debug( logger.debug(
f"Seeking to frame {frame}, on frame {self.__frame}, " "Seeking to frame %s, on frame %s, __next %s, location: %s",
f"__next {self.__next}, location: {self.fp.tell()}" frame,
self.__frame,
self.__next,
self.fp.tell(),
) )
self.fp.seek(self.__next) self.fp.seek(self.__next)
self._frame_pos.append(self.__next) self._frame_pos.append(self.__next)
logger.debug("Loading tags, location: %s" % self.fp.tell()) logger.debug("Loading tags, location: %s", self.fp.tell())
self.tag_v2.load(self.fp) self.tag_v2.load(self.fp)
if self.tag_v2.next in self._frame_pos: if self.tag_v2.next in self._frame_pos:
# This IFD has already been processed # This IFD has already been processed
@ -1330,18 +1333,18 @@ class TiffImageFile(ImageFile.ImageFile):
fillorder = self.tag_v2.get(FILLORDER, 1) fillorder = self.tag_v2.get(FILLORDER, 1)
logger.debug("*** Summary ***") logger.debug("*** Summary ***")
logger.debug(f"- compression: {self._compression}") logger.debug("- compression: %s", self._compression)
logger.debug(f"- photometric_interpretation: {photo}") logger.debug("- photometric_interpretation: %s", photo)
logger.debug(f"- planar_configuration: {self._planar_configuration}") logger.debug("- planar_configuration: %s", self._planar_configuration)
logger.debug(f"- fill_order: {fillorder}") logger.debug("- fill_order: %s", fillorder)
logger.debug(f"- YCbCr subsampling: {self.tag.get(YCBCRSUBSAMPLING)}") logger.debug("- YCbCr subsampling: %s", self.tag.get(YCBCRSUBSAMPLING))
# size # size
xsize = int(self.tag_v2.get(IMAGEWIDTH)) xsize = int(self.tag_v2.get(IMAGEWIDTH))
ysize = int(self.tag_v2.get(IMAGELENGTH)) ysize = int(self.tag_v2.get(IMAGELENGTH))
self._size = xsize, ysize self._size = xsize, ysize
logger.debug(f"- size: {self.size}") logger.debug("- size: %s", self.size)
sample_format = self.tag_v2.get(SAMPLEFORMAT, (1,)) sample_format = self.tag_v2.get(SAMPLEFORMAT, (1,))
if len(sample_format) > 1 and max(sample_format) == min(sample_format) == 1: if len(sample_format) > 1 and max(sample_format) == min(sample_format) == 1:
@ -1397,7 +1400,7 @@ class TiffImageFile(ImageFile.ImageFile):
bps_tuple, bps_tuple,
extra_tuple, extra_tuple,
) )
logger.debug(f"format key: {key}") logger.debug("format key: %s", key)
try: try:
self._mode, rawmode = OPEN_INFO[key] self._mode, rawmode = OPEN_INFO[key]
except KeyError as e: except KeyError as e:
@ -1405,8 +1408,8 @@ class TiffImageFile(ImageFile.ImageFile):
msg = "unknown pixel mode" msg = "unknown pixel mode"
raise SyntaxError(msg) from e raise SyntaxError(msg) from e
logger.debug(f"- raw mode: {rawmode}") logger.debug("- raw mode: %s", rawmode)
logger.debug(f"- pil mode: {self.mode}") logger.debug("- pil mode: %s", self.mode)
self.info["compression"] = self._compression self.info["compression"] = self._compression
@ -1447,7 +1450,7 @@ class TiffImageFile(ImageFile.ImageFile):
if fillorder == 2: if fillorder == 2:
# Replace fillorder with fillorder=1 # Replace fillorder with fillorder=1
key = key[:3] + (1,) + key[4:] key = key[:3] + (1,) + key[4:]
logger.debug(f"format key: {key}") logger.debug("format key: %s", key)
# this should always work, since all the # this should always work, since all the
# fillorder==2 modes have a corresponding # fillorder==2 modes have a corresponding
# fillorder=1 mode # fillorder=1 mode
@ -1610,7 +1613,7 @@ def _save(im, fp, filename):
info = exif info = exif
else: else:
info = {} info = {}
logger.debug("Tiffinfo Keys: %s" % list(info)) logger.debug("Tiffinfo Keys: %s", list(info))
if isinstance(info, ImageFileDirectory_v1): if isinstance(info, ImageFileDirectory_v1):
info = info.to_v2() info = info.to_v2()
for key in info: for key in info:
@ -1743,7 +1746,7 @@ def _save(im, fp, filename):
ifd[JPEGQUALITY] = quality ifd[JPEGQUALITY] = quality
logger.debug("Saving using libtiff encoder") logger.debug("Saving using libtiff encoder")
logger.debug("Items: %s" % sorted(ifd.items())) logger.debug("Items: %s", sorted(ifd.items()))
_fp = 0 _fp = 0
if hasattr(fp, "fileno"): if hasattr(fp, "fileno"):
try: try:
@ -1811,7 +1814,7 @@ def _save(im, fp, filename):
if SAMPLEFORMAT in atts and len(atts[SAMPLEFORMAT]) == 1: if SAMPLEFORMAT in atts and len(atts[SAMPLEFORMAT]) == 1:
atts[SAMPLEFORMAT] = atts[SAMPLEFORMAT][0] atts[SAMPLEFORMAT] = atts[SAMPLEFORMAT][0]
logger.debug("Converted items: %s" % sorted(atts.items())) logger.debug("Converted items: %s", sorted(atts.items()))
# libtiff always expects the bytes in native order. # libtiff always expects the bytes in native order.
# we're storing image byte order. So, if the rawmode # we're storing image byte order. So, if the rawmode