Close file pointer earlier (#8895)

Author: radarhere

Tests/test_file_bmp.py

@@ -190,9 +190,9 @@ def test_rle8() -> None:
     # Signal end of bitmap before the image is finished
     with open("Tests/images/bmp/g/pal8rle.bmp", "rb") as fp:
         data = fp.read(1063) + b"\x01"
-        with Image.open(io.BytesIO(data)) as im:
-            with pytest.raises(ValueError):
-                im.load()
+    with Image.open(io.BytesIO(data)) as im:
+        with pytest.raises(ValueError):
+            im.load()
 
 
 def test_rle4() -> None:
@@ -214,9 +214,9 @@ def test_rle4() -> None:
 def test_rle8_eof(file_name: str, length: int) -> None:
     with open(file_name, "rb") as fp:
         data = fp.read(length)
-        with Image.open(io.BytesIO(data)) as im:
-            with pytest.raises(ValueError):
-                im.load()
+    with Image.open(io.BytesIO(data)) as im:
+        with pytest.raises(ValueError):
+            im.load()
 
 
 def test_offset() -> None:

Tests/test_file_jpeg2k.py

@@ -457,8 +457,8 @@ def test_comment() -> None:
     # Test an image that is truncated partway through a codestream
     with open("Tests/images/comment.jp2", "rb") as fp:
         b = BytesIO(fp.read(130))
-        with Image.open(b) as im:
-            pass
+    with Image.open(b) as im:
+        pass
 
 
 def test_save_comment(card: ImageFile.ImageFile) -> None:

Tests/test_file_libtiff.py

@@ -81,7 +81,7 @@ def test_g4_tiff_bytesio(self, tmp_path: Path) -> None:
         s = io.BytesIO()
         with open(test_file, "rb") as f:
             s.write(f.read())
-            s.seek(0)
+        s.seek(0)
         with Image.open(s) as im:
             assert im.size == (500, 500)
             self._assert_noerr(tmp_path, im)
@@ -1050,12 +1050,12 @@ def test_old_style_jpeg_orientation(self) -> None:
         with open("Tests/images/old-style-jpeg-compression.tif", "rb") as fp:
             data = fp.read()
 
-            # Set EXIF Orientation to 2
-            data = data[:102] + b"\x02" + data[103:]
+        # Set EXIF Orientation to 2
+        data = data[:102] + b"\x02" + data[103:]
 
-            with Image.open(io.BytesIO(data)) as im:
-                im = im.transpose(Image.Transpose.FLIP_LEFT_RIGHT)
-            assert_image_equal_tofile(im, "Tests/images/old-style-jpeg-compression.png")
+        with Image.open(io.BytesIO(data)) as im:
+            im = im.transpose(Image.Transpose.FLIP_LEFT_RIGHT)
+        assert_image_equal_tofile(im, "Tests/images/old-style-jpeg-compression.png")
 
     def test_open_missing_samplesperpixel(self) -> None:
         with Image.open(

Tests/test_file_libtiff_small.py

@@ -32,7 +32,7 @@ def test_g4_hopper_bytesio(self, tmp_path: Path) -> None:
         s = BytesIO()
         with open(test_file, "rb") as f:
             s.write(f.read())
-            s.seek(0)
+        s.seek(0)
         with Image.open(s) as im:
             assert im.size == (128, 128)
             self._assert_noerr(tmp_path, im)