From 85f439f575a1ae5e3e11262e9b0a6d838f541aa6 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 25 Feb 2025 18:46:22 +1100 Subject: [PATCH] _seek_check already raises an EOFError --- src/PIL/MicImagePlugin.py | 7 +------ src/PIL/PsdImagePlugin.py | 14 +++++--------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/PIL/MicImagePlugin.py b/src/PIL/MicImagePlugin.py index bbddd972e..9ce38c427 100644 --- a/src/PIL/MicImagePlugin.py +++ b/src/PIL/MicImagePlugin.py @@ -73,12 +73,7 @@ class MicImageFile(TiffImagePlugin.TiffImageFile): def seek(self, frame: int) -> None: if not self._seek_check(frame): return - try: - filename = self.images[frame] - except IndexError as e: - msg = "no such frame" - raise EOFError(msg) from e - + filename = self.images[frame] self.fp = self.ole.openstream(filename) TiffImagePlugin.TiffImageFile._open(self) diff --git a/src/PIL/PsdImagePlugin.py b/src/PIL/PsdImagePlugin.py index c59d302e5..0aada8a06 100644 --- a/src/PIL/PsdImagePlugin.py +++ b/src/PIL/PsdImagePlugin.py @@ -169,15 +169,11 @@ class PsdImageFile(ImageFile.ImageFile): return # seek to given layer (1..max) - try: - _, mode, _, tile = self.layers[layer - 1] - self._mode = mode - self.tile = tile - self.frame = layer - self.fp = self._fp - except IndexError as e: - msg = "no such layer" - raise EOFError(msg) from e + _, mode, _, tile = self.layers[layer - 1] + self._mode = mode + self.tile = tile + self.frame = layer + self.fp = self._fp def tell(self) -> int: # return layer number (0=image, 1..max=layers)