Merge pull request #3461 from radarhere/exclusive_fp

Close exclusive fp before discarding

Tests/test_file_cur.py

@@ -26,6 +26,7 @@ class TestFileCur(PillowTestCase):
         no_cursors_file = "Tests/images/no_cursors.cur"
 
         cur = CurImagePlugin.CurImageFile(TEST_FILE)
+        cur.fp.close()
         with open(no_cursors_file, "rb") as cur.fp:
             self.assertRaises(TypeError, cur._open)
 

Tests/test_file_icns.py

@@ -17,7 +17,10 @@ class TestFileIcns(PillowTestCase):
         # Loading this icon by default should result in the largest size
         # (512x512@2x) being loaded
         im = Image.open(TEST_FILE)
-        im.load()
+
+        # Assert that there is no unclosed file warning
+        self.assert_warning(None, im.load)
+
         self.assertEqual(im.mode, "RGBA")
         self.assertEqual(im.size, (1024, 1024))
         self.assertEqual(im.format, "ICNS")

Tests/test_file_png.py

@@ -327,7 +327,9 @@ class TestFilePng(PillowTestCase):
         # Check open/load/verify exception (@PIL150)
 
         im = Image.open(TEST_PNG_FILE)
-        im.verify()
+
+        # Assert that there is no unclosed file warning
+        self.assert_warning(None, im.verify)
 
         im = Image.open(TEST_PNG_FILE)
         im.load()

src/PIL/IcnsImagePlugin.py

@@ -311,6 +311,8 @@ class IcnsImageFile(ImageFile.ImageFile):
         self.im = im.im
         self.mode = im.mode
         self.size = im.size
+        if self._exclusive_fp:
+            self.fp.close()
         self.fp = None
         self.icns = None
         self.tile = ()

src/PIL/PngImagePlugin.py

@@ -600,6 +600,8 @@ class PngImageFile(ImageFile.ImageFile):
         self.png.verify()
         self.png.close()
 
+        if self._exclusive_fp:
+            self.fp.close()
         self.fp = None
 
     def load_prepare(self):