Assert fp is not None

radarhere · radarhere · commit 82b266a8020a · 2025-04-03T18:40:14.000+11:00
diff --git a/Tests/test_file_bufrstub.py b/Tests/test_file_bufrstub.py
@@ -61,6 +61,7 @@ def open(self, im: ImageFile.StubImageFile) -> None:
 
         def load(self, im: ImageFile.StubImageFile) -> Image.Image:
             self.loaded = True
+            assert im.fp is not None
             im.fp.close()
             return Image.new("RGB", (1, 1))
 
diff --git a/Tests/test_file_cur.py b/Tests/test_file_cur.py
@@ -26,6 +26,7 @@ def test_invalid_file() -> None:
     no_cursors_file = "Tests/images/no_cursors.cur"
 
     cur = CurImagePlugin.CurImageFile(TEST_FILE)
+    assert cur.fp is not None
     cur.fp.close()
     with open(no_cursors_file, "rb") as cur.fp:
         with pytest.raises(TypeError):
diff --git a/Tests/test_file_gribstub.py b/Tests/test_file_gribstub.py
@@ -61,6 +61,7 @@ def open(self, im: Image.Image) -> None:
 
         def load(self, im: Image.Image) -> Image.Image:
             self.loaded = True
+            assert im.fp is not None
             im.fp.close()
             return Image.new("RGB", (1, 1))
 
diff --git a/Tests/test_file_hdf5stub.py b/Tests/test_file_hdf5stub.py
@@ -63,6 +63,7 @@ def open(self, im: Image.Image) -> None:
 
         def load(self, im: Image.Image) -> Image.Image:
             self.loaded = True
+            assert im.fp is not None
             im.fp.close()
             return Image.new("RGB", (1, 1))
 
diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py
@@ -1110,8 +1110,9 @@ def test_fd_leak(self, tmp_path: Path) -> None:
             im.save(tmpfile)
 
         im = Image.open(tmpfile)
+        assert im.fp is not None
+        assert not im.fp.closed
         fp = im.fp
-        assert not fp.closed
         with pytest.raises(OSError):
             os.remove(tmpfile)
         im.load()
diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py
@@ -11,7 +11,15 @@
 
 import pytest
 
-from PIL import Image, ImageFilter, ImageOps, TiffImagePlugin, TiffTags, features
+from PIL import (
+    Image,
+    ImageFile,
+    ImageFilter,
+    ImageOps,
+    TiffImagePlugin,
+    TiffTags,
+    features,
+)
 from PIL.TiffImagePlugin import OSUBFILETYPE, SAMPLEFORMAT, STRIPOFFSETS, SUBIFD
 
 from .helper import (
@@ -564,8 +572,9 @@ def test_bw_compression_w_rgb(self, compression: str, tmp_path: Path) -> None:
             im.save(out, compression=compression)
 
     def test_fp_leak(self) -> None:
-        im: Image.Image | None = Image.open("Tests/images/hopper_g4_500.tif")
+        im: ImageFile.ImageFile | None = Image.open("Tests/images/hopper_g4_500.tif")
         assert im is not None
+        assert im.fp is not None
         fn = im.fp.fileno()
 
         os.fstat(fn)
diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py
@@ -956,6 +956,7 @@ def test_close_on_load_exclusive(self, tmp_path: Path) -> None:
 
         im = Image.open(tmpfile)
         fp = im.fp
+        assert fp is not None
         assert not fp.closed
         im.load()
         assert fp.closed
@@ -969,6 +970,7 @@ def test_close_on_load_nonexclusive(self, tmp_path: Path) -> None:
         with open(tmpfile, "rb") as f:
             im = Image.open(f)
             fp = im.fp
+            assert fp is not None
             assert not fp.closed
             im.load()
             assert not fp.closed
@@ -1019,8 +1021,9 @@ def test_fd_leak(self, tmp_path: Path) -> None:
             im.save(tmpfile)
 
         im = Image.open(tmpfile)
+        assert im.fp is not None
+        assert not im.fp.closed
         fp = im.fp
-        assert not fp.closed
         with pytest.raises(OSError):
             os.remove(tmpfile)
         im.load()
diff --git a/Tests/test_image_load.py b/Tests/test_image_load.py
@@ -38,6 +38,7 @@ def test_close_after_load(caplog: pytest.LogCaptureFixture) -> None:
 def test_contextmanager() -> None:
     fn = None
     with Image.open("Tests/images/hopper.gif") as im:
+        assert im.fp is not None
         fn = im.fp.fileno()
         os.fstat(fn)
 
diff --git a/docs/example/DdsImagePlugin.py b/docs/example/DdsImagePlugin.py
@@ -213,6 +213,7 @@ class DdsImageFile(ImageFile.ImageFile):
     format_description = "DirectDraw Surface"
 
     def _open(self) -> None:
+        assert self.fp is not None
         if not _accept(self.fp.read(4)):
             msg = "not a DDS file"
             raise SyntaxError(msg)
diff --git a/src/PIL/BlpImagePlugin.py b/src/PIL/BlpImagePlugin.py
@@ -258,6 +258,7 @@ class BlpImageFile(ImageFile.ImageFile):
     format_description = "Blizzard Mipmap Format"
 
     def _open(self) -> None:
+        assert self.fp is not None
         self.magic = self.fp.read(4)
         if not _accept(self.magic):
             msg = f"Bad BLP magic {repr(self.magic)}"
diff --git a/src/PIL/BmpImagePlugin.py b/src/PIL/BmpImagePlugin.py
@@ -76,6 +76,7 @@ class BmpImageFile(ImageFile.ImageFile):
 
     def _bitmap(self, header: int = 0, offset: int = 0) -> None:
         """Read relevant info about the BMP"""
+        assert self.fp is not None
         read, seek = self.fp.read, self.fp.seek
         if header:
             seek(header)
@@ -311,6 +312,7 @@ def _bitmap(self, header: int = 0, offset: int = 0) -> None:
     def _open(self) -> None:
         """Open file, check magic number and read header"""
         # read 14 bytes: magic number, filesize, reserved, header final offset
+        assert self.fp is not None
         head_data = self.fp.read(14)
         # choke if the file does not have the required magic bytes
         if not _accept(head_data):
diff --git a/src/PIL/BufrStubImagePlugin.py b/src/PIL/BufrStubImagePlugin.py
@@ -41,6 +41,7 @@ class BufrStubImageFile(ImageFile.StubImageFile):
     format_description = "BUFR"
 
     def _open(self) -> None:
+        assert self.fp is not None
         if not _accept(self.fp.read(4)):
             msg = "Not a BUFR file"
             raise SyntaxError(msg)
diff --git a/src/PIL/CurImagePlugin.py b/src/PIL/CurImagePlugin.py
@@ -38,6 +38,7 @@ class CurImageFile(BmpImagePlugin.BmpImageFile):
     format_description = "Windows Cursor"
 
     def _open(self) -> None:
+        assert self.fp is not None
         offset = self.fp.tell()
 
         # check magic
diff --git a/src/PIL/DcxImagePlugin.py b/src/PIL/DcxImagePlugin.py
@@ -45,6 +45,7 @@ class DcxImageFile(PcxImageFile):
 
     def _open(self) -> None:
         # Header
+        assert self.fp is not None
         s = self.fp.read(4)
         if not _accept(s):
             msg = "not a DCX file"
diff --git a/src/PIL/DdsImagePlugin.py b/src/PIL/DdsImagePlugin.py
@@ -333,6 +333,7 @@ class DdsImageFile(ImageFile.ImageFile):
     format_description = "DirectDraw Surface"
 
     def _open(self) -> None:
+        assert self.fp is not None
         if not _accept(self.fp.read(4)):
             msg = "not a DDS file"
             raise SyntaxError(msg)
diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py
@@ -189,6 +189,7 @@ class EpsImageFile(ImageFile.ImageFile):
     mode_map = {1: "L", 2: "LAB", 3: "RGB", 4: "CMYK"}
 
     def _open(self) -> None:
+        assert self.fp is not None
         (length, offset) = self._find_offset(self.fp)
 
         # go to offset - start of "%!PS"
@@ -400,6 +401,7 @@ def load(
     ) -> Image.core.PixelAccess | None:
         # Load EPS via Ghostscript
         if self.tile:
+            assert self.fp is not None
             self.im = Ghostscript(self.tile, self.size, self.fp, scale, transparency)
             self._mode = self.im.mode
             self._size = self.im.size
diff --git a/src/PIL/FliImagePlugin.py b/src/PIL/FliImagePlugin.py
@@ -48,6 +48,7 @@ class FliImageFile(ImageFile.ImageFile):
 
     def _open(self) -> None:
         # HEAD
+        assert self.fp is not None
         s = self.fp.read(128)
         if not (_accept(s) and s[20:22] == b"\x00\x00"):
             msg = "not an FLI/FLC file"
@@ -111,6 +112,7 @@ def _palette(self, palette: list[tuple[int, int, int]], shift: int) -> None:
         # load palette
 
         i = 0
+        assert self.fp is not None
         for e in range(i16(self.fp.read(2))):
             s = self.fp.read(2)
             i = i + s[0]
diff --git a/src/PIL/FpxImagePlugin.py b/src/PIL/FpxImagePlugin.py
@@ -58,6 +58,7 @@ def _open(self) -> None:
         # read the OLE directory and see if this is a likely
         # to be a FlashPix file
 
+        assert self.fp is not None
         try:
             self.ole = olefile.OleFileIO(self.fp)
         except OSError as e:
@@ -229,6 +230,7 @@ def _open_subimage(self, index: int = 1, subimage: int = 0) -> None:
                 if y >= ysize:
                     break  # isn't really required
 
+        assert self.fp is not None
         self.stream = stream
         self._fp = self.fp
         self.fp = None
diff --git a/src/PIL/FtexImagePlugin.py b/src/PIL/FtexImagePlugin.py
@@ -72,6 +72,7 @@ class FtexImageFile(ImageFile.ImageFile):
     format_description = "Texture File Format (IW2:EOC)"
 
     def _open(self) -> None:
+        assert self.fp is not None
         if not _accept(self.fp.read(4)):
             msg = "not an FTEX file"
             raise SyntaxError(msg)
diff --git a/src/PIL/GbrImagePlugin.py b/src/PIL/GbrImagePlugin.py
@@ -42,6 +42,7 @@ class GbrImageFile(ImageFile.ImageFile):
     format_description = "GIMP brush file"
 
     def _open(self) -> None:
+        assert self.fp is not None
         header_size = i32(self.fp.read(4))
         if header_size < 20:
             msg = "not a GIMP brush"
@@ -90,6 +91,7 @@ def _open(self) -> None:
 
     def load(self) -> Image.core.PixelAccess | None:
         if self._im is None:
+            assert self.fp is not None
             self.im = Image.core.new(self.mode, self.size)
             self.frombytes(self.fp.read(self._data_size))
         return Image.Image.load(self)
diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py
@@ -85,6 +85,7 @@ class GifImageFile(ImageFile.ImageFile):
     global_palette = None
 
     def data(self) -> bytes | None:
+        assert self.fp is not None
         s = self.fp.read(1)
         if s and s[0]:
             return self.fp.read(s[0])
@@ -98,6 +99,7 @@ def _is_palette_needed(self, p: bytes) -> bool:
 
     def _open(self) -> None:
         # Screen
+        assert self.fp is not None
         s = self.fp.read(13)
         if not _accept(s):
             msg = "not a GIF file"
diff --git a/src/PIL/GribStubImagePlugin.py b/src/PIL/GribStubImagePlugin.py
@@ -41,6 +41,7 @@ class GribStubImageFile(ImageFile.StubImageFile):
     format_description = "GRIB"
 
     def _open(self) -> None:
+        assert self.fp is not None
         if not _accept(self.fp.read(8)):
             msg = "Not a GRIB file"
             raise SyntaxError(msg)
diff --git a/src/PIL/Hdf5StubImagePlugin.py b/src/PIL/Hdf5StubImagePlugin.py
@@ -41,6 +41,7 @@ class HDF5StubImageFile(ImageFile.StubImageFile):
     format_description = "HDF5"
 
     def _open(self) -> None:
+        assert self.fp is not None
         if not _accept(self.fp.read(8)):
             msg = "Not an HDF file"
             raise SyntaxError(msg)
diff --git a/src/PIL/IcnsImagePlugin.py b/src/PIL/IcnsImagePlugin.py
@@ -266,6 +266,7 @@ class IcnsImageFile(ImageFile.ImageFile):
     format_description = "Mac OS icns resource"
 
     def _open(self) -> None:
+        assert self.fp is not None
         self.icns = IcnsFile(self.fp)
         self._mode = "RGBA"
         self.info["sizes"] = self.icns.itersizes()
diff --git a/src/PIL/IcoImagePlugin.py b/src/PIL/IcoImagePlugin.py
@@ -326,6 +326,7 @@ class IcoImageFile(ImageFile.ImageFile):
     format_description = "Windows Icon"
 
     def _open(self) -> None:
+        assert self.fp is not None
         self.ico = IcoFile(self.fp)
         self.info["sizes"] = self.ico.sizes()
         self.size = self.ico.entry[0].dim
diff --git a/src/PIL/ImImagePlugin.py b/src/PIL/ImImagePlugin.py
@@ -125,6 +125,7 @@ def _open(self) -> None:
         # Quick rejection: if there's not an LF among the first
         # 100 bytes, this is (probably) not a text header.
 
+        assert self.fp is not None
         if b"\n" not in self.fp.read(100):
             msg = "not an IM file"
             raise SyntaxError(msg)
diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py
@@ -283,6 +283,7 @@ def load(self) -> Image.core.PixelAccess | None:
         self.map: mmap.mmap | None = None
         use_mmap = self.filename and len(self.tile) == 1
 
+        assert self.fp is not None
         readonly = 0
 
         # look for read/seek overrides
diff --git a/src/PIL/IptcImagePlugin.py b/src/PIL/IptcImagePlugin.py
@@ -77,6 +77,7 @@ def getint(self, key: tuple[int, int]) -> int:
     def field(self) -> tuple[tuple[int, int] | None, int]:
         #
         # get a IPTC field header
+        assert self.fp is not None
         s = self.fp.read(5)
         if not s.strip(b"\x00"):
             return None, 0
@@ -104,6 +105,7 @@ def field(self) -> tuple[tuple[int, int] | None, int]:
 
     def _open(self) -> None:
         # load descriptive fields
+        assert self.fp is not None
         while True:
             offset = self.fp.tell()
             tag, size = self.field()
@@ -157,6 +159,7 @@ def load(self) -> Image.core.PixelAccess | None:
 
         offset, compression = self.tile[0][2:]
 
+        assert self.fp is not None
         self.fp.seek(offset)
 
         # Copy image data to temporary file
diff --git a/src/PIL/Jpeg2KImagePlugin.py b/src/PIL/Jpeg2KImagePlugin.py
@@ -248,6 +248,7 @@ class Jpeg2KImageFile(ImageFile.ImageFile):
     format_description = "JPEG 2000 (ISO 15444)"
 
     def _open(self) -> None:
+        assert self.fp is not None
         sig = self.fp.read(4)
         if sig == b"\xff\x4f\xff\x51":
             self.codec = "j2k"
@@ -300,6 +301,7 @@ def _open(self) -> None:
         ]
 
     def _parse_comment(self) -> None:
+        assert self.fp is not None
         while True:
             marker = self.fp.read(2)
             if not marker:
diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py
diff --git a/src/PIL/MicImagePlugin.py b/src/PIL/MicImagePlugin.py
diff --git a/src/PIL/MpoImagePlugin.py b/src/PIL/MpoImagePlugin.py
diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py
diff --git a/src/PIL/PsdImagePlugin.py b/src/PIL/PsdImagePlugin.py
diff --git a/src/PIL/QoiImagePlugin.py b/src/PIL/QoiImagePlugin.py
diff --git a/src/PIL/SpiderImagePlugin.py b/src/PIL/SpiderImagePlugin.py
diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py
diff --git a/src/PIL/WalImageFile.py b/src/PIL/WalImageFile.py
diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py
diff --git a/src/PIL/WmfImagePlugin.py b/src/PIL/WmfImagePlugin.py
diff --git a/src/PIL/XpmImagePlugin.py b/src/PIL/XpmImagePlugin.py
