Skip to content

Pathlibify font_manager (only internally, doesn't change the API). #10435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 11, 2018
Merged

Pathlibify font_manager (only internally, doesn't change the API). #10435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 23 additions & 58 deletions lib/matplotlib/font_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
from collections import Iterable
from functools import lru_cache
import json
import logging
import os
from pathlib import Path
import subprocess
import sys
from threading import Timer
import warnings
import logging

from matplotlib import afm, cbook, ft2font, rcParams, get_cachedir
from matplotlib.fontconfig_pattern import (
Expand Down Expand Up @@ -130,13 +130,8 @@
]

if not USE_FONTCONFIG and sys.platform != 'win32':
home = os.environ.get('HOME')
if home is not None:
# user fonts on OSX
path = os.path.join(home, 'Library', 'Fonts')
OSXFontDirectories.append(path)
path = os.path.join(home, '.fonts')
X11FontDirectories.append(path)
OSXFontDirectories.append(str(Path.home() / "Library/Fonts"))
X11FontDirectories.append(str(Path.home() / ".fonts"))


def get_fontext_synonyms(fontext):
Expand All @@ -161,26 +156,20 @@ def list_fonts(directory, extensions):


def win32FontDirectory():
"""
r"""
Return the user-specified font directory for Win32. This is
looked up from the registry key::

\\\\HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\Fonts
\\HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders\Fonts

If the key is not found, $WINDIR/Fonts will be returned.
"""
import winreg
try:
user = winreg.OpenKey(winreg.HKEY_CURRENT_USER, MSFolders)
try:
with winreg.OpenKey(winreg.HKEY_CURRENT_USER, MSFolders) as user:
return winreg.QueryValueEx(user, 'Fonts')[0]
except OSError:
pass # Fall through to default
finally:
winreg.CloseKey(user)
except OSError:
pass # Fall through to default
return os.path.join(os.environ['WINDIR'], 'Fonts')
return os.path.join(os.environ['WINDIR'], 'Fonts')


def win32InstalledFonts(directory=None, fontext='ttf'):
Expand All @@ -198,33 +187,23 @@ def win32InstalledFonts(directory=None, fontext='ttf'):

fontext = get_fontext_synonyms(fontext)

key, items = None, set()
items = set()
for fontdir in MSFontDirectories:
try:
local = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, fontdir)
except OSError:
continue
if not local:
return list_fonts(directory, fontext)
try:
for j in range(winreg.QueryInfoKey(local)[1]):
try:
with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, fontdir) as local:
for j in range(winreg.QueryInfoKey(local)[1]):
key, direc, tp = winreg.EnumValue(local, j)
if not isinstance(direc, str):
continue
# Work around for https://bugs.python.org/issue25778, which
# is fixed in Py>=3.6.1.
direc = direc.split("\0", 1)[0]
if not os.path.dirname(direc):
direc = os.path.join(directory, direc)
direc = os.path.abspath(direc).lower()
if os.path.splitext(direc)[1][1:] in fontext:
items.add(direc)
except (EnvironmentError, MemoryError, WindowsError):
continue
return list(items)
finally:
winreg.CloseKey(local)
path = Path(directory, direc).resolve()
if path.suffix.lower() in fontext:
items.add(str(path))
return list(items)
except (OSError, MemoryError):
continue
return None


Expand Down Expand Up @@ -261,7 +240,7 @@ def get_fontconfig_fonts(fontext='ttf'):
"""
fontext = get_fontext_synonyms(fontext)
return [fname for fname in _call_fc_list()
if os.path.splitext(fname)[1][1:] in fontext]
if Path(fname).suffix[1:] in fontext]


def findSystemFonts(fontpaths=None, fontext='ttf'):
Expand All @@ -277,31 +256,21 @@ def findSystemFonts(fontpaths=None, fontext='ttf'):

if fontpaths is None:
if sys.platform == 'win32':
fontdir = win32FontDirectory()

fontpaths = [fontdir]
fontpaths = [win32FontDirectory()]
# now get all installed fonts directly...
for f in win32InstalledFonts(fontdir):
base, ext = os.path.splitext(f)
if len(ext)>1 and ext[1:].lower() in fontexts:
fontfiles.add(f)
fontfiles.update(win32InstalledFonts(fontext=fontext))
else:
fontpaths = X11FontDirectories
fontfiles.update(get_fontconfig_fonts(fontext))
# check for OS X & load its fonts if present
if sys.platform == 'darwin':
for f in OSXInstalledFonts(fontext=fontext):
fontfiles.add(f)

for f in get_fontconfig_fonts(fontext):
fontfiles.add(f)
fontfiles.update(OSXInstalledFonts(fontext=fontext))

elif isinstance(fontpaths, str):
fontpaths = [fontpaths]

for path in fontpaths:
files = list_fonts(path, fontexts)
for fname in files:
fontfiles.add(os.path.abspath(fname))
fontfiles.update(map(os.path.abspath, list_fonts(path, fontexts)))

return [fname for fname in fontfiles if os.path.exists(fname)]

Expand Down Expand Up @@ -1225,16 +1194,12 @@ def _findfont_cached(self, prop, fontext, directory, fallback_to_default,
else:
fontlist = self.ttflist

if directory is not None:
directory = os.path.normcase(directory)

best_score = 1e64
best_font = None

for font in fontlist:
if (directory is not None and
os.path.commonprefix([os.path.normcase(font.fname),
directory]) != directory):
Path(directory) not in Path(font.fname).parents):
continue
# Matching family should have highest priority, so it is multiplied
# by 10.0
Expand Down
13 changes: 2 additions & 11 deletions lib/matplotlib/tests/test_font_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
from __future__ import absolute_import, division, print_function

import six

import os
import shutil
import tempfile
import warnings

Expand All @@ -14,13 +11,7 @@
get_fontconfig_fonts, is_opentype_cff_font, fontManager as fm)
from matplotlib import rc_context

if six.PY2:
from distutils.spawn import find_executable
has_fclist = find_executable('fc-list') is not None
else:
# py >= 3.3
from shutil import which
has_fclist = which('fc-list') is not None
has_fclist = shutil.which('fc-list') is not None


def test_font_priority():
Expand Down