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

default to using /usr/share when XDG_DATA_DIRS is empty or unset

Browse Source
This commit is contained in:
Charles Law 2014-12-29 17:03:39 -08:00
parent ee7b15c924
commit 1c6a89e4c2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PIL/ImageFont.py
View File

@ -252,7 +252,12 @@ def truetype(font=None, size=10, index=0, encoding="", filename=None):
filename = os.path.join(windir, "fonts", font) filename = os.path.join(windir, "fonts", font)
return FreeTypeFont(filename, size, index, encoding) return FreeTypeFont(filename, size, index, encoding)
elif sys.platform in ('linux', 'linux2'): elif sys.platform in ('linux', 'linux2'):
lindirs = os.environ.get("XDG_DATA_DIRS", "").split(":") lindirs = os.environ.get("XDG_DATA_DIRS", "")
if not lindirs:
#According to the freedesktop spec, XDG_DATA_DIRS should
#default to /usr/share
lindirs = '/usr/share'
lindirs = lindirs.split(":")
for lindir in lindirs: for lindir in lindirs:
parentpath = os.path.join(lindir, "fonts") parentpath = os.path.join(lindir, "fonts")
for walkroot, walkdir, walkfilenames in os.walk(parentpath): for walkroot, walkdir, walkfilenames in os.walk(parentpath):