Merge pull request #5661 from mdboom/filenotfound-py2

tacaswell · tacaswell · commit 053e1a8645e9 · 2015-12-12T23:41:35.000-05:00
Fix #5660. No FileNotFoundError on Py2
diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
@@ -387,7 +387,11 @@ def _fnt_def(self, k, c, s, d, a, l, n):
         fontname = n[-l:].decode('ascii')
         tfm = _tfmfile(fontname)
         if tfm is None:
-            raise FileNotFoundError("missing font metrics file: %s" % fontname)
+            if six.PY2:
+                error_class = OSError
+            else:
+                error_class = FileNotFoundError
+            raise error_class("missing font metrics file: %s" % fontname)
         if c != 0 and tfm.checksum != 0 and c != tfm.checksum:
             raise ValueError('tfm checksum mismatch: %s'%n)
 
