Assert fp is not None #8617

radarhere · 2024-12-23T00:11:16Z

This is part of #8362 - I'm hoping to break down that PR into easier-to-review chunks.

ImageFile's fp may be None.

>>> from PIL import Image
>>> im = Image.open("Tests/images/hopper.png")
>>> im.fp
<_io.BufferedReader name='Tests/images/hopper.png'>
>>> im.close()
>>> im.fp is None
True

So before using it, let's assert that it isn't None.

radarhere · 2024-12-23T00:12:14Z

Tests/test_file_libtiff.py

@@ -556,8 +564,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")


Image.open returns an ImageFile instance.

Pillow/src/PIL/Image.py

Lines 3404 to 3408 in 0e3f51d

def open(

fp: StrOrBytesPath | IO[bytes],

mode: Literal["r"] = "r",

formats: list[str] | tuple[str, ...] | None = None,

) -> ImageFile.ImageFile:

Assert fp is not None

ab708da

radarhere added the Type hints label Dec 23, 2024

radarhere commented Dec 23, 2024

View reviewed changes

radarhere mentioned this pull request Dec 23, 2024

Added type hints #8362

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Assert fp is not None #8617

Assert fp is not None #8617

radarhere commented Dec 23, 2024

radarhere Dec 23, 2024

	def open(
	fp: StrOrBytesPath \| IO[bytes],
	mode: Literal["r"] = "r",
	formats: list[str] \| tuple[str, ...] \| None = None,
	) -> ImageFile.ImageFile:

Assert fp is not None #8617

Are you sure you want to change the base?

Assert fp is not None #8617

Conversation

radarhere commented Dec 23, 2024

radarhere Dec 23, 2024

Choose a reason for hiding this comment