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

Changed truetype() to prefer .ttf extensions

Browse Source
This commit is contained in:
Andrew Murray 2015-02-27 14:50:54 +11:00
parent 84ec2af495
commit 3e9e95b00a
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PIL/ImageFont.py
View File

@ -283,12 +283,21 @@ def truetype(font=None, size=10, index=0, encoding="", filename=None):
os.path.expanduser('~/Library/Fonts/')] os.path.expanduser('~/Library/Fonts/')]
ext = os.path.splitext(ttf_filename)[1] ext = os.path.splitext(ttf_filename)[1]
firstFontWithADifferentExtension = None
for dir in dirs: for dir in dirs:
for walkroot, walkdir, walkfilenames in os.walk(dir): for walkroot, walkdir, walkfilenames in os.walk(dir):
for walkfilename in walkfilenames: for walkfilename in walkfilenames:
if (ext and walkfilename == ttf_filename) or (not ext and os.path.splitext(walkfilename)[0] == ttf_filename): if ext and walkfilename == ttf_filename:
fontpath = os.path.join(walkroot, walkfilename) fontpath = os.path.join(walkroot, walkfilename)
return FreeTypeFont(fontpath, size, index, encoding) return FreeTypeFont(fontpath, size, index, encoding)
elif not ext and os.path.splitext(walkfilename)[0] == ttf_filename:
fontpath = os.path.join(walkroot, walkfilename)
if os.path.splitext(fontpath)[1] == '.ttf':
return FreeTypeFont(fontpath, size, index, encoding)
if not ext and firstFontWithADifferentExtension == None:
firstFontWithADifferentExtension = fontpath
if firstFontWithADifferentExtension:
return FreeTypeFont(firstFontWithADifferentExtension, size, index, encoding)
raise raise