Reintroduce the verify_main_display function to check during runtime if Python was installed as a framework

Michiel de Hoon · Michiel de Hoon · commit c44b4c2ddc85 · 2015-05-21T18:29:15.000+09:00
diff --git a/lib/matplotlib/backends/backend_macosx.py b/lib/matplotlib/backends/backend_macosx.py
@@ -23,6 +23,14 @@
 import matplotlib
 from matplotlib.backends import _macosx
 
+if not _macosx.verify_main_display():
+    import warnings
+    warnings.warn("Python is not installed as a framework. The MacOSX "
+                  "backend may not work correctly if Python is not "
+                  "installed as a framework. Please see the Python "
+                  "documentation for more information on installing "
+                  "Python as a framework on Mac OS X.")
+
 
 class Show(ShowBase):
     def mainloop(self):
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -6208,7 +6208,24 @@ static void timer_callback(CFRunLoopTimerRef timer, void* info)
     Timer_new,                 /* tp_new */
 };
 
+
+static PyObject*
+verify_main_display(PyObject* self)
+{
+    PyObject* result;
+    CGDirectDisplayID display = CGMainDisplayID();
+    if (display == 0) result = Py_False;
+    else result = Py_True;
+    Py_INCREF(result);
+    return result;
+}
+
 static struct PyMethodDef methods[] = {
+   {"verify_main_display",
+    (PyCFunction)verify_main_display,
+    METH_NOARGS,
+    "Verifies if the main display can be found. This function returns False if Python is not built as a framework."
+   },
    {"show",
     (PyCFunction)show,
     METH_NOARGS,
