Merge pull request #9198 from tacaswell/fix_afm_unicode

tacaswell · web-flow · commit cece2d403a90 · 2017-09-24T12:47:02.000-04:00
FIX: always decode byte strings from AFM files as utf8 Self-merging due to approvals from @anntzer and @dopplershift
diff --git a/lib/matplotlib/afm.py b/lib/matplotlib/afm.py
@@ -189,7 +189,9 @@ def _parse_char_metrics(fh):
     ascii_d = {}
     name_d = {}
     for line in fh:
-        line = line.rstrip().decode('ascii')  # Convert from byte-literal
+        # We are defensively letting values be utf8. The spec requires
+        # ascii, but there are non-compliant fonts in circulation
+        line = _to_str(line.rstrip())  # Convert from byte-literal
         if line.startswith('EndCharMetrics'):
             return ascii_d, name_d
         # Split the metric line into a dictionary, keyed by metric identifiers
@@ -392,7 +394,7 @@ def get_str_bbox_and_descent(self, s):
         maxy = 0
         left = 0
         if not isinstance(s, six.text_type):
-            s = s.decode('ascii')
+            s = _to_str(s)
         for c in s:
             if c == '\n':
                 continue
