Close OleFileIO instance when closing or exiting FPX or MIC

Tests/test_file_bufrstub.py

@@ -56,6 +56,7 @@ def open(self, im):
 
         def load(self, im):
             self.loaded = True
+            im.fp.close()
             return Image.new("RGB", (1, 1))
 
         def save(self, im, fp, filename):

Tests/test_file_fits.py

@@ -60,6 +60,7 @@ def open(self, im):
 
         def load(self, im):
             self.loaded = True
+            im.fp.close()
             return Image.new("RGB", (1, 1))
 
     handler = Handler()

Tests/test_file_fpx.py

@@ -18,6 +18,16 @@ def test_sanity():
         assert_image_equal_tofile(im, "Tests/images/input_bw_one_band.png")
 
 
+def test_close():
+    with Image.open("Tests/images/input_bw_one_band.fpx") as im:
+        pass
+    assert im.ole.fp.closed
+
+    im = Image.open("Tests/images/input_bw_one_band.fpx")
+    im.close()
+    assert im.ole.fp.closed
+
+
 def test_invalid_file():
     # Test an invalid OLE file
     invalid_file = "Tests/images/flower.jpg"

Tests/test_file_gribstub.py

@@ -56,6 +56,7 @@ def open(self, im):
 
         def load(self, im):
             self.loaded = True
+            im.fp.close()
             return Image.new("RGB", (1, 1))
 
         def save(self, im, fp, filename):

Tests/test_file_hdf5stub.py

@@ -57,6 +57,7 @@ def open(self, im):
 
         def load(self, im):
             self.loaded = True
+            im.fp.close()
             return Image.new("RGB", (1, 1))
 
         def save(self, im, fp, filename):

Tests/test_file_mic.py

@@ -51,6 +51,16 @@ def test_seek():
         assert im.tell() == 0
 
 
+def test_close():
+    with Image.open(TEST_FILE) as im:
+        pass
+    assert im.ole.fp.closed
+
+    im = Image.open(TEST_FILE)
+    im.close()
+    assert im.ole.fp.closed
+
+
 def test_invalid_file():
     # Test an invalid OLE file
     invalid_file = "Tests/images/flower.jpg"

Tests/test_imageshow.py

@@ -55,8 +55,8 @@ def test_show_without_viewers():
     viewers = ImageShow._viewers
     ImageShow._viewers = []
 
-    im = hopper()
-    assert not ImageShow.show(im)
+    with hopper() as im:
+        assert not ImageShow.show(im)
 
     ImageShow._viewers = viewers
 

src/PIL/FpxImagePlugin.py

@@ -235,6 +235,14 @@ def load(self):
 
         return ImageFile.ImageFile.load(self)
 
+    def close(self):
+        self.ole.close()
+        super().close()
+
+    def __exit__(self, *args):
+        self.ole.close()
+        super().__exit__()
+
 
 #
 # --------------------------------------------------------------------

src/PIL/MicImagePlugin.py

@@ -89,6 +89,14 @@ def seek(self, frame):
     def tell(self):
         return self.frame
 
+    def close(self):
+        self.ole.close()
+        super().close()
+
+    def __exit__(self, *args):
+        self.ole.close()
+        super().__exit__()
+
 
 #
 # --------------------------------------------------------------------