Merge pull request #2088 from cgohlke/patch-4

mdboom · mdboom · commit b19630900a01 · 2013-05-30T07:53:39.000-07:00
Fix `KeyError: (1, 0, 0, 6)` in backend_ps on Windows
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -748,7 +748,13 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
             self.track_characters(font, s)
 
             self.set_color(*gc.get_rgb())
-            self.set_font(font.get_sfnt()[(1,0,0,6)], prop.get_size_in_points())
+            sfnt = font.get_sfnt()
+            try:
+                ps_name = sfnt[(1,0,0,6)]
+            except KeyError:
+                ps_name = sfnt[(3,1,0x0409,6)].decode(
+                    'utf-16be').encode('ascii','replace')
+            self.set_font(ps_name, prop.get_size_in_points())
 
             cmap = font.get_charmap()
             lastgind = None
diff --git a/lib/matplotlib/textpath.py b/lib/matplotlib/textpath.py
@@ -61,7 +61,12 @@ def _get_char_id(self, font, ccode):
         """
         Return a unique id for the given font and character-code set.
         """
-        ps_name = font.get_sfnt()[(1, 0, 0, 6)]
+        sfnt = font.get_sfnt()
+        try:
+            ps_name = sfnt[(1,0,0,6)]
+        except KeyError:
+            ps_name = sfnt[(3,1,0x0409,6)].decode(
+                'utf-16be').encode('ascii','replace')
         char_id = urllib.quote('%s-%x' % (ps_name, ccode))
         return char_id
 
