Skip to content

Commit

Permalink
Merge pull request #6869 from hugovk/simplify
Browse files Browse the repository at this point in the history
Simplify isinstance, key in dict, enumerate
  • Loading branch information
radarhere authored Jan 8, 2023
2 parents f30eb38 + 8d5eb71 commit 569b86b
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 17 deletions.
4 changes: 1 addition & 3 deletions Tests/test_file_mpo.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,7 @@ def test_mp_no_data():
def test_mp_attribute(test_file):
with Image.open(test_file) as im:
mpinfo = im._getmp()
frame_number = 0
for mpentry in mpinfo[0xB002]:
for frame_number, mpentry in enumerate(mpinfo[0xB002]):
mpattr = mpentry["Attribute"]
if frame_number:
assert not mpattr["RepresentativeImageFlag"]
Expand All @@ -180,7 +179,6 @@ def test_mp_attribute(test_file):
assert mpattr["ImageDataFormat"] == "JPEG"
assert mpattr["MPType"] == "Multi-Frame Image: (Disparity)"
assert mpattr["Reserved"] == 0
frame_number += 1


@pytest.mark.parametrize("test_file", test_files)
Expand Down
2 changes: 1 addition & 1 deletion Tests/test_file_png.py
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ def test_roundtrip_private_chunk(self):

def test_textual_chunks_after_idat(self):
with Image.open("Tests/images/hopper.png") as im:
assert "comment" in im.text.keys()
assert "comment" in im.text
for k, v in {
"date:create": "2014-09-04T09:37:08+03:00",
"date:modify": "2014-09-04T09:37:08+03:00",
Expand Down
2 changes: 1 addition & 1 deletion src/PIL/GifImagePlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ def _normalize_mode(im):
if Image.getmodebase(im.mode) == "RGB":
im = im.convert("P", palette=Image.Palette.ADAPTIVE)
if im.palette.mode == "RGBA":
for rgba in im.palette.colors.keys():
for rgba in im.palette.colors:
if rgba[3] == 0:
im.info["transparency"] = im.palette.colors[rgba]
break
Expand Down
2 changes: 1 addition & 1 deletion src/PIL/Image.py
Original file line number Diff line number Diff line change
Expand Up @@ -3841,7 +3841,7 @@ def hide_offsets(self):
def __str__(self):
if self._info is not None:
# Load all keys into self._data
for tag in self._info.keys():
for tag in self._info:
self[tag]

return str(self._data)
Expand Down
4 changes: 1 addition & 3 deletions src/PIL/PdfParser.py
Original file line number Diff line number Diff line change
Expand Up @@ -328,9 +328,7 @@ def pdf_repr(x):
return b"null"
elif isinstance(x, (PdfName, PdfDict, PdfArray, PdfBinary)):
return bytes(x)
elif isinstance(x, int):
return str(x).encode("us-ascii")
elif isinstance(x, float):
elif isinstance(x, (int, float)):
return str(x).encode("us-ascii")
elif isinstance(x, time.struct_time):
return b"(D:" + time.strftime("%Y%m%d%H%M%SZ", x).encode("us-ascii") + b")"
Expand Down
4 changes: 1 addition & 3 deletions src/PIL/PsdImagePlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,15 +238,13 @@ def read(size):
layers.append((name, mode, (x0, y0, x1, y1)))

# get tiles
i = 0
for name, mode, bbox in layers:
for i, (name, mode, bbox) in enumerate(layers):
tile = []
for m in mode:
t = _maketile(fp, m, bbox, 1)
if t:
tile.extend(t)
layers[i] = name, mode, bbox, tile
i += 1

return layers

Expand Down
6 changes: 3 additions & 3 deletions src/PIL/TiffImagePlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@
(MM, 8, (1,), 1, (8, 8, 8), ()): ("LAB", "LAB"),
}

MAX_SAMPLESPERPIXEL = max(len(key_tp[4]) for key_tp in OPEN_INFO.keys())
MAX_SAMPLESPERPIXEL = max(len(key_tp[4]) for key_tp in OPEN_INFO)

PREFIXES = [
b"MM\x00\x2A", # Valid TIFF header with big-endian byte order
Expand Down Expand Up @@ -1222,7 +1222,7 @@ def load_end(self):

# load IFD data from fp before it is closed
exif = self.getexif()
for key in TiffTags.TAGS_V2_GROUPS.keys():
for key in TiffTags.TAGS_V2_GROUPS:
if key not in exif:
continue
exif.get_ifd(key)
Expand Down Expand Up @@ -1629,7 +1629,7 @@ def _save(im, fp, filename):
if isinstance(info, ImageFileDirectory_v1):
info = info.to_v2()
for key in info:
if isinstance(info, Image.Exif) and key in TiffTags.TAGS_V2_GROUPS.keys():
if isinstance(info, Image.Exif) and key in TiffTags.TAGS_V2_GROUPS:
ifd[key] = info.get_ifd(key)
else:
ifd[key] = info.get(key)
Expand Down
4 changes: 2 additions & 2 deletions winbuild/build_prepare.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def cmd_rmdir(path):
def cmd_nmake(makefile=None, target="", params=None):
if params is None:
params = ""
elif isinstance(params, list) or isinstance(params, tuple):
elif isinstance(params, (list, tuple)):
params = " ".join(params)
else:
params = str(params)
Expand All @@ -58,7 +58,7 @@ def cmd_nmake(makefile=None, target="", params=None):
def cmd_cmake(params=None, file="."):
if params is None:
params = ""
elif isinstance(params, list) or isinstance(params, tuple):
elif isinstance(params, (list, tuple)):
params = " ".join(params)
else:
params = str(params)
Expand Down

0 comments on commit 569b86b

Please sign in to comment.