Merge pull request #2307 from mdboom/font-name-decoding

mdboom · mdboom · commit ffb37468644b · 2013-08-27T12:07:50.000-07:00
font_manager.py UnicodeDecodeError when starting ipython --pylab
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -1002,11 +1002,12 @@ def embedTTFType42(font, characters, descriptor):
         # You are lost in a maze of TrueType tables, all different...
         sfnt = font.get_sfnt()
         try:
-            ps_name = sfnt[(1,0,0,6)] # Macintosh scheme
+            ps_name = sfnt[(1,0,0,6)].decode('macroman') # Macintosh scheme
         except KeyError:
             # Microsoft scheme:
-            ps_name = sfnt[(3,1,0x0409,6)].decode('utf-16be').encode('ascii','replace')
+            ps_name = sfnt[(3,1,0x0409,6)].decode('utf-16be')
             # (see freetype/ttnameid.h)
+        ps_name = ps_name.encode('ascii', 'replace')
         ps_name = Name(ps_name)
         pclt = font.get_sfnt_table('pclt') \
             or { 'capHeight': 0, 'xHeight': 0 }
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -750,10 +750,11 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
             self.set_color(*gc.get_rgb())
             sfnt = font.get_sfnt()
             try:
-                ps_name = sfnt[(1,0,0,6)]
+                ps_name = sfnt[(1,0,0,6)].decode('macroman')
             except KeyError:
                 ps_name = sfnt[(3,1,0x0409,6)].decode(
-                    'utf-16be').encode('ascii','replace')
+                    'utf-16be')
+            ps_name = ps_name.encode('ascii','replace')
             self.set_font(ps_name, prop.get_size_in_points())
 
             cmap = font.get_charmap()
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -391,11 +391,11 @@ def ttfFontProperty(font):
     sfnt2 = sfnt.get((1,0,0,2))
     sfnt4 = sfnt.get((1,0,0,4))
     if sfnt2:
-        sfnt2 = sfnt2.decode('ascii').lower()
+        sfnt2 = sfnt2.decode('macroman').lower()
     else:
         sfnt2 = ''
     if sfnt4:
-        sfnt4 = sfnt4.decode('ascii').lower()
+        sfnt4 = sfnt4.decode('macroman').lower()
     else:
         sfnt4 = ''
     if sfnt4.find('oblique') >= 0:
diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py
@@ -169,7 +169,7 @@ def __init__(self):
         ff = rcParams['font.family']
         if len(ff) == 1 and ff[0].lower() in self.font_families:
             self.font_family = ff[0].lower()
-        elif ff.lower() in self.font_families:
+        elif isinstance(ff, basestring) and ff.lower() in self.font_families:
             self.font_family = ff.lower()
         else:
             mpl.verbose.report(
diff --git a/lib/matplotlib/textpath.py b/lib/matplotlib/textpath.py
@@ -63,7 +63,7 @@ def _get_char_id(self, font, ccode):
         """
         sfnt = font.get_sfnt()
         try:
-            ps_name = sfnt[(1, 0, 0, 6)].decode('ascii')
+            ps_name = sfnt[(1, 0, 0, 6)].decode('macroman')
         except KeyError:
             ps_name = sfnt[(3, 1, 0x0409, 6)].decode('utf-16be')
         char_id = urllib.quote('%s-%x' % (ps_name, ccode))
