Fix font manager so it doesn't miss some fonts whose attributes don't parse as UTF-8.

astropy-buildbot · astropy-buildbot · commit ba5610f445b6 · 2011-02-22T13:04:31.000-05:00
Update font manager to have same font path search as master.
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -240,7 +240,8 @@ def OSXFontDirectory():
         try:
             if os.path.isdir(fontdir):
                 for root, dirs, files in os.walk(fontdir):
-                    fontpaths.append(root)
+                    for dir in dirs:
+                        fontpaths.append(os.path.join(root, dir))
         except (IOError, OSError, TypeError, ValueError):
             pass
     return fontpaths
@@ -278,7 +279,8 @@ def x11FontDirectory():
         try:
             if os.path.isdir(fontdir):
                 for root, dirs, files in os.walk(fontdir):
-                    fontpaths.append(root)
+                    for dir in dirs:
+                        fontpaths.append(os.path.join(root, dir))
         except (IOError, OSError, TypeError, ValueError):
             pass
     return fontpaths
@@ -604,8 +606,7 @@ def createFontList(fontfiles, fontext='ttf'):
                 verbose.report("Cannot handle unicode filenames")
                 #print >> sys.stderr, 'Bad file is', fpath
                 continue
-            try: prop = ttfFontProperty(font)
-            except: continue
+            prop = ttfFontProperty(font)
 
         fontlist.append(prop)
     return fontlist
@@ -1291,14 +1292,6 @@ def is_opentype_cff_font(filename):
 
 fontManager = None
 
-_fmcache = os.path.join(get_configdir(), 'fontList.cache')
-
-def _rebuild():
-    global fontManager
-    fontManager = FontManager()
-    pickle_dump(fontManager, _fmcache)
-    verbose.report("generated new fontManager")
-
 # The experimental fontconfig-based backend.
 if USE_FONTCONFIG and sys.platform != 'win32':
     import re
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -1637,7 +1637,8 @@ FT2Font::get_sfnt(const Py::Tuple & args)
         key[2] = Py::Int(sfnt.language_id);
         key[3] = Py::Int(sfnt.name_id);
         names[key] = Py::String((char *) sfnt.string,
-                                (int) sfnt.string_len);
+                                (int) sfnt.string_len,
+                                "latin-1");
     }
     return names;
 }

Original file line number	Diff line number	Diff line change
`@@ -1637,7 +1637,8 @@ FT2Font::get_sfnt(const Py::Tuple & args)`
`1637`	`1637`	`key[2] = Py::Int(sfnt.language_id);`
`1638`	`1638`	`key[3] = Py::Int(sfnt.name_id);`
`1639`	`1639`	`names[key] = Py::String((char *) sfnt.string,`
`1640`		`- (int) sfnt.string_len);`
	`1640`	`+ (int) sfnt.string_len,`
	`1641`	`+ "latin-1");`
`1641`	`1642`	`}`
`1642`	`1643`	`return names;`
`1643`	`1644`	`}`