Merge pull request #24415 from story645/ft2err

ksunden · web-flow · commit df761c9ffd8e · 2022-11-10T11:07:08.000-06:00
made f2tfont error message explicit that it needs path to file
diff --git a/lib/matplotlib/tests/test_font_manager.py b/lib/matplotlib/tests/test_font_manager.py
@@ -146,7 +146,7 @@ def test_find_invalid(tmpdir):
 
     # Not really public, but get_font doesn't expose non-filename constructor.
     from matplotlib.ft2font import FT2Font
-    with pytest.raises(TypeError, match='path or binary-mode file'):
+    with pytest.raises(TypeError, match='font file or a binary-mode file'):
         FT2Font(StringIO())
 
 
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -433,7 +433,7 @@ static int PyFT2Font_init(PyFT2Font *self, PyObject *args, PyObject *kwds)
                || !(data = PyObject_CallMethod(filename, "read", "i", 0))
                || !PyBytes_Check(data)) {
         PyErr_SetString(PyExc_TypeError,
-                        "First argument must be a path or binary-mode file object");
+                        "First argument must be a path to a font file or a binary-mode file object");
         Py_CLEAR(data);
         goto exit;
     } else {
