Pass strings to FT2Font -- never Unicode strings.

mdboom · mdboom · commit 0af3c48908a4 · 2010-04-23T18:34:32.000Z
svn path=/trunk/matplotlib/; revision=8269
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -654,7 +654,7 @@ def createType1Descriptor(self, t1font, fontfile):
         if 0:             flags |= 1 << 17 # TODO: small caps
         if 0:             flags |= 1 << 18 # TODO: force bold
 
-        ft2font = FT2Font(fontfile)
+        ft2font = FT2Font(str(fontfile))
 
         descriptor = {
             'Type':        Name('FontDescriptor'),
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -1104,7 +1104,7 @@ def write(self, *kl, **kwargs):
         if not rcParams['ps.useafm']:
             for font_filename, chars in ps_renderer.used_characters.values():
                 if len(chars):
-                    font = FT2Font(font_filename)
+                    font = FT2Font(str(font_filename))
                     cmap = font.get_charmap()
                     glyph_ids = []
                     for c in chars:
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -597,7 +597,7 @@ def _get_font(self, font):
 
         cached_font = self._fonts.get(basename)
         if cached_font is None:
-            font = FT2Font(basename)
+            font = FT2Font(str(basename))
             cached_font = self.CachedFont(font)
             self._fonts[basename] = cached_font
             self._fonts[font.postscript_name] = cached_font
diff --git a/lib/matplotlib/textpath.py b/lib/matplotlib/textpath.py
@@ -311,7 +311,7 @@ def get_glyphs_tex(self, prop, s, glyph_map=None,
 
             if font_and_encoding is None:
                 font_bunch =  self.tex_font_map[dvifont.texname]
-                font = FT2Font(font_bunch.filename)
+                font = FT2Font(str(font_bunch.filename))
                 try:
                     font.select_charmap(1094992451) # select ADOBE_CUSTOM
                 except ValueError:
