Merge pull request #3545 from mdehoon/setfont_informative_error_message

tacaswell · tacaswell · commit a62e7f3939e0 · 2014-09-22T11:55:28.000-04:00
MNT : Provide an informative error message if something goes wrong in setfont
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -2531,14 +2531,23 @@ static CGFloat _get_device_scale(CGContextRef cr)
        "CourierNewPS-Bold-ItalicMT"},
     };
 
-    if(!PyList_Check(family)) return 0;
+    if(!PyList_Check(family))
+    {
+        PyErr_SetString(PyExc_ValueError, "family should be a list");
+        return 0;
+    }
     n = PyList_GET_SIZE(family);
 
     for (i = 0; i < n; i++)
     {
         PyObject* item = PyList_GET_ITEM(family, i);
         ascii = PyUnicode_AsASCIIString(item);
-        if(!ascii) return 0;
+        if(!ascii)
+        {
+            PyErr_SetString(PyExc_ValueError,
+                            "failed to convert font family name to ASCII");
+            return 0;
+        }
         temp = PyBytes_AS_STRING(ascii);
         for (j = 0; j < NMAP; j++)
         {    if (!strcmp(map[j].name, temp))
