Minor improvement to font_manager -- don't cache directory-specific results.

mdboom · mdboom · commit e4f944b2c9bc · 2010-05-12T17:58:17.000Z
svn path=/trunk/matplotlib/; revision=8315
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -1193,10 +1193,7 @@ def findfont(self, prop, fontext='ttf', directory=None,
         <http://www.w3.org/TR/1998/REC-CSS2-19980512/>`_ documentation
         for a description of the font finding algorithm.
         """
-        debug = False
-        if prop is None:
-            prop = FontProperties()
-        if is_string_like(prop):
+        if not isinstance(prop, FontProperties):
             prop = FontProperties(prop)
         fname = prop.get_file()
         if fname is not None:
@@ -1210,9 +1207,10 @@ def findfont(self, prop, fontext='ttf', directory=None,
             font_cache = self.ttf_lookup_cache
             fontlist = self.ttflist
 
-        cached = font_cache.get(hash(prop))
-        if cached:
-            return cached
+        if directory is None:
+            cached = font_cache.get(hash(prop))
+            if cached:
+                return cached
 
         best_score = 1e64
         best_font = None
@@ -1258,7 +1256,8 @@ def findfont(self, prop, fontext='ttf', directory=None,
                 (prop, best_font.name, best_font.fname, best_score))
             result = best_font.fname
 
-        font_cache[hash(prop)] = result
+        if directory is None:
+            font_cache[hash(prop)] = result
         return result
 
 
