python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-26 09:14:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3461 from radarhere/exclusive_fp

Browse Source 
Close exclusive fp before discarding
This commit is contained in:
Hugo 2018-12-13 21:07:32 +02:00 committed by GitHub
commit 857b077f5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Tests/test_file_cur.py
View File

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

5
Tests/test_file_icns.py
View File

@ -17,7 +17,10 @@ class TestFileIcns(PillowTestCase):
# Loading this icon by default should result in the largest size # Loading this icon by default should result in the largest size
# (512x512@2x) being loaded # (512x512@2x) being loaded
im = Image.open(TEST_FILE) 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.mode, "RGBA")
self.assertEqual(im.size, (1024, 1024)) self.assertEqual(im.size, (1024, 1024))
self.assertEqual(im.format, "ICNS") self.assertEqual(im.format, "ICNS")

4
Tests/test_file_png.py
View File

@ -327,7 +327,9 @@ class TestFilePng(PillowTestCase):
# Check open/load/verify exception (@PIL150) # Check open/load/verify exception (@PIL150)
im = Image.open(TEST_PNG_FILE) 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 = Image.open(TEST_PNG_FILE)
im.load() im.load()

2
src/PIL/IcnsImagePlugin.py
View File

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

2
src/PIL/PngImagePlugin.py
View File

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