Merge pull request #5851 from radarhere/context_managers

Tests/check_fli_oob.py

@@ -61,8 +61,8 @@ repro_copy = (
 
 
 for path in repro_ss2 + repro_lc + repro_advance + repro_brun + repro_copy:
-    im = Image.open(path)
-    try:
-        im.load()
-    except Exception as msg:
-        print(msg)
+    with Image.open(path) as im:
+        try:
+            im.load()
+        except Exception as msg:
+            print(msg)

Tests/check_jp2_overflow.py

@@ -19,8 +19,8 @@ from PIL import Image
 repro = ("00r0_gray_l.jp2", "00r1_graya_la.jp2")
 
 for path in repro:
-    im = Image.open(path)
-    try:
-        im.load()
-    except Exception as msg:
-        print(msg)
+    with Image.open(path) as im:
+        try:
+            im.load()
+        except Exception as msg:
+            print(msg)

Tests/test_file_jpeg2k.py

@@ -31,9 +31,9 @@ def roundtrip(im, **options):
     im.save(out, "JPEG2000", **options)
     test_bytes = out.tell()
     out.seek(0)
-    im = Image.open(out)
-    im.bytes = test_bytes  # for testing only
-    im.load()
+    with Image.open(out) as im:
+        im.bytes = test_bytes  # for testing only
+        im.load()
     return im
 
 

Tests/test_file_png.py

@@ -757,8 +757,8 @@ class TestFilePng:
 
         if buffer:
             mystdout = mystdout.buffer
-        reloaded = Image.open(mystdout)
-        assert_image_equal_tofile(reloaded, TEST_PNG_FILE)
+        with Image.open(mystdout) as reloaded:
+            assert_image_equal_tofile(reloaded, TEST_PNG_FILE)
 
 
 @pytest.mark.skipif(is_win32(), reason="Requires Unix or macOS")

Tests/test_image_resize.py

@@ -154,8 +154,8 @@ class TestImagingCoreResize:
 
 @pytest.fixture
 def gradients_image():
-    im = Image.open("Tests/images/radial_gradients.png")
-    im.load()
+    with Image.open("Tests/images/radial_gradients.png") as im:
+        im.load()
     try:
         yield im
     finally:

Tests/test_imagechops.py

@@ -368,11 +368,11 @@ def test_subtract_modulo_no_clip():
 
 def test_soft_light():
     # Arrange
-    im1 = Image.open("Tests/images/hopper.png")
-    im2 = Image.open("Tests/images/hopper-XYZ.png")
+    with Image.open("Tests/images/hopper.png") as im1:
+        with Image.open("Tests/images/hopper-XYZ.png") as im2:
 
-    # Act
-    new = ImageChops.soft_light(im1, im2)
+            # Act
+            new = ImageChops.soft_light(im1, im2)
 
     # Assert
     assert new.getpixel((64, 64)) == (163, 54, 32)
@@ -381,11 +381,11 @@ def test_soft_light():
 
 def test_hard_light():
     # Arrange
-    im1 = Image.open("Tests/images/hopper.png")
-    im2 = Image.open("Tests/images/hopper-XYZ.png")
+    with Image.open("Tests/images/hopper.png") as im1:
+        with Image.open("Tests/images/hopper-XYZ.png") as im2:
 
-    # Act
-    new = ImageChops.hard_light(im1, im2)
+            # Act
+            new = ImageChops.hard_light(im1, im2)
 
     # Assert
     assert new.getpixel((64, 64)) == (144, 50, 27)
@@ -394,11 +394,11 @@ def test_hard_light():
 
 def test_overlay():
     # Arrange
-    im1 = Image.open("Tests/images/hopper.png")
-    im2 = Image.open("Tests/images/hopper-XYZ.png")
+    with Image.open("Tests/images/hopper.png") as im1:
+        with Image.open("Tests/images/hopper-XYZ.png") as im2:
 
-    # Act
-    new = ImageChops.overlay(im1, im2)
+            # Act
+            new = ImageChops.overlay(im1, im2)
 
     # Assert
     assert new.getpixel((64, 64)) == (159, 50, 27)

Tests/test_pickle.py

@@ -88,10 +88,10 @@ def test_pickle_la_mode_with_palette(tmp_path):
 @skip_unless_feature("webp")
 def test_pickle_tell():
     # Arrange
-    image = Image.open("Tests/images/hopper.webp")
+    with Image.open("Tests/images/hopper.webp") as image:
 
-    # Act: roundtrip
-    unpickled_image = pickle.loads(pickle.dumps(image))
+        # Act: roundtrip
+        unpickled_image = pickle.loads(pickle.dumps(image))
 
     # Assert
     assert unpickled_image.tell() == 0

Tests/test_sgi_crash.py

@@ -21,6 +21,6 @@ from PIL import Image
 )
 def test_crashes(test_file):
     with open(test_file, "rb") as f:
-        im = Image.open(f)
-        with pytest.raises(OSError):
-            im.load()
+        with Image.open(f) as im:
+            with pytest.raises(OSError):
+                im.load()