From f2a2f2645e6e2473990f0851f6e3eb49a80b2fad Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Wed, 16 Jan 2013 12:46:20 -0500 Subject: [PATCH 1/2] Fix USE_FONTCONFIG == True mode. --- lib/matplotlib/font_manager.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py index f9418dc5b4bd..6399e6731a03 100644 --- a/lib/matplotlib/font_manager.py +++ b/lib/matplotlib/font_manager.py @@ -777,7 +777,7 @@ def get_size_in_points(self): return float(self._size) except ValueError: pass - default_size = fontManager.get_default_size() + default_size = FontManager.get_default_size() return default_size * font_scalings.get(self._size) def get_file(self): @@ -1008,7 +1008,8 @@ def get_default_weight(self): """ return self.__default_weight - def get_default_size(self): + @staticmethod + def get_default_size(): """ Return the default font size. """ From e87722398538821d8953081b89247136af98ddf6 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Fri, 25 Jan 2013 13:24:10 -0500 Subject: [PATCH 2/2] Fix for when no afm files are installed. From https://bugzilla.redhat.com/show_bug.cgi?id=896182, though fixed in a different way. --- lib/matplotlib/font_manager.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py index 6399e6731a03..373601875d22 100644 --- a/lib/matplotlib/font_manager.py +++ b/lib/matplotlib/font_manager.py @@ -997,7 +997,10 @@ def __init__(self, size=None, weight='normal'): self.afmfiles = findSystemFonts(paths, fontext='afm') + \ findSystemFonts(fontext='afm') self.afmlist = createFontList(self.afmfiles, fontext='afm') - self.defaultFont['afm'] = self.afmfiles[0] + if len(self.afmfiles): + self.defaultFont['afm'] = self.afmfiles[0] + else: + self.defaultFont['afm'] = None self.ttf_lookup_cache = {} self.afm_lookup_cache = {}