python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-28 10:56:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2232 from jdufresne/font-close-file

Browse Source 
Close file after finished reading in ImageFont._load_pilfont()
This commit is contained in:
wiredfool 2016-11-22 11:59:36 +00:00 committed by GitHub
commit 806e5343d8
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
PIL/ImageFont.py
View File

@ -62,23 +62,22 @@ class ImageFont(object):
def _load_pilfont(self, filename): def _load_pilfont(self, filename):
fp = open(filename, "rb") with open(filename, "rb") as fp:
for ext in (".png", ".gif", ".pbm"):
for ext in (".png", ".gif", ".pbm"): try:
try: fullname = os.path.splitext(filename)[0] + ext
fullname = os.path.splitext(filename)[0] + ext image = Image.open(fullname)
image = Image.open(fullname) except:
except: pass
pass else:
if image and image.mode in ("1", "L"):
break
else: else:
if image and image.mode in ("1", "L"): raise IOError("cannot find glyph data file")
break
else:
raise IOError("cannot find glyph data file")
self.file = fullname self.file = fullname
return self._load_pilfont_data(fp, image) return self._load_pilfont_data(fp, image)
def _load_pilfont_data(self, file, image): def _load_pilfont_data(self, file, image):