Be more pythonic - fail safely rather than prevent failure

joelfrederico · joelfrederico · commit bcdfab5cbf22 · 2021-11-30T00:12:10.000-08:00
Some image types may not be handled. OS updates may change which image types are valid. Rather than check, the code will fail if pdf's aren't allowed. If we need more complexity than that, we can update the code.
diff --git a/lib/matplotlib/backends/backend_macosx.py b/lib/matplotlib/backends/backend_macosx.py
@@ -66,9 +66,7 @@ class FigureManagerMac(_macosx.FigureManager, FigureManagerBase):
     Wrap everything up into a window for the pylab interface
     """
     def __init__(self, canvas, num):
-        icon_path = None
-        if 'com.adobe.pdf' in _macosx.FigureManager._get_image_types():
-            icon_path = str(cbook._get_data_path('images/matplotlib.pdf'))
+        icon_path = str(cbook._get_data_path('images/matplotlib.pdf'))
         _macosx.FigureManager.__init__(self, canvas, icon_path)
         FigureManagerBase.__init__(self, canvas, num)
         if mpl.rcParams['toolbar'] == 'toolbar2':
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -817,23 +817,6 @@ int set_icon(PyObject* icon_path) {
     Py_RETURN_NONE;
 }
 
-static PyObject*
-FigureManager__get_image_types(PyObject* no_self, PyObject* no_args)
-{
-    NSArray<NSString*>* images = NSImage.imageUnfilteredTypes;
-    const NSUInteger n_images = [images count];
-    PyObject* out = PyList_New(n_images);
-    if (!out) {
-        [images release];
-        return NULL;
-    }
-    for (NSUInteger i=0; i < n_images; ++i) {
-        const char* string = images[i].UTF8String;
-        PyList_SET_ITEM(out, i, PyUnicode_FromString(string));
-    }
-    return out;
-}
-
 static PyMethodDef FigureManager_methods[] = {
     {"show",
      (PyCFunction)FigureManager_show,
@@ -860,11 +843,6 @@ int set_icon(PyObject* icon_path) {
      METH_VARARGS,
      NULL,  // docstring inherited.
     },
-    {"_get_image_types",
-     FigureManager__get_image_types,
-     METH_STATIC | METH_NOARGS,
-     "Return image types supported by macOS"
-    },
     {NULL}  /* Sentinel */
 };
 
