Merge pull request #9292 from cgohlke/patch-1

tacaswell · web-flow · commit e10c52377bd8 · 2017-10-22T20:30:14.000-04:00
FIX: TypeError a bytes-like object is required, not 'str'
diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
@@ -1030,6 +1030,14 @@ def find_tex_file(filename, format=None):
         The library that :program:`kpsewhich` is part of.
     """
 
+    if six.PY3:
+        # we expect these to always be ascii encoded, but use utf-8
+        # out of caution
+        if isinstance(filename, bytes):
+            filename = filename.decode('utf-8', errors='replace')
+        if isinstance(format, bytes):
+            format = format.decode('utf-8', errors='replace')
+
     cmd = [str('kpsewhich')]
     if format is not None:
         cmd += ['--format=' + format]
