FIX: always decode bytes as utf-8 in AFM headers

tacaswell · tacaswell · commit ce928591fc9f · 2017-02-04T18:31:07.000-05:00
closes #3517
diff --git a/lib/matplotlib/afm.py b/lib/matplotlib/afm.py
@@ -57,12 +57,12 @@
 def _to_int(x):
     return int(float(x))
 
+
 _to_float = float
-if six.PY3:
-    def _to_str(x):
-        return x.decode('utf8')
-else:
-    _to_str = str
+
+
+def _to_str(x):
+    return x.decode('utf8')
 
 
 def _to_list_of_ints(s):
