python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-03-03 19:45:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4823 from radarhere/close

Browse Source 
Do not try to close file pointer if file pointer is empty
This commit is contained in:
Hugo van Kemenade 2020-08-23 14:26:11 +03:00 committed by GitHub
commit 27d34d2f13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Tests/test_image_load.py
View File

@ -1,3 +1,4 @@
import logging
import os import os
import pytest import pytest
@ -23,6 +24,14 @@ def test_close():
im.getpixel((0, 0)) im.getpixel((0, 0))
def test_close_after_load(caplog):
im = Image.open("Tests/images/hopper.gif")
im.load()
with caplog.at_level(logging.DEBUG):
im.close()
assert len(caplog.records) == 0
def test_contextmanager(): def test_contextmanager():
fn = None fn = None
with Image.open("Tests/images/hopper.gif") as im: with Image.open("Tests/images/hopper.gif") as im:

1
src/PIL/Image.py
View File

@ -594,6 +594,7 @@ class Image:
try: try:
if hasattr(self, "_close__fp"): if hasattr(self, "_close__fp"):
self._close__fp() self._close__fp()
if self.fp:
self.fp.close() self.fp.close()
self.fp = None self.fp = None
except Exception as msg: except Exception as msg: