FIX: macosx framework check

jklymak · jklymak · commit 1086de7eb530 · 2018-08-13T13:32:40.000-07:00
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -269,9 +269,41 @@ - (int)index;
 
 static bool backend_inited = false;
 
-static void lazy_init(void) {
+static bool verify_framework(void)
+{
+  #ifdef COMPILING_FOR_10_6
+       NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+       NSRunningApplication* app = [NSRunningApplication currentApplication];
+       NSApplicationActivationPolicy activationPolicy = [app activationPolicy];
+       [pool release];
+       switch (activationPolicy) {
+           case NSApplicationActivationPolicyRegular:
+           case NSApplicationActivationPolicyAccessory:
+               return true;
+           case NSApplicationActivationPolicyProhibited:
+               break;
+       }
+   #else
+       ProcessSerialNumber psn;
+       if (CGMainDisplayID()!=0
+        && GetCurrentProcess(&psn)==noErr
+        && SetFrontProcess(&psn)==noErr) return true;
+   #endif
+    PyErr_SetString(PyExc_ImportError,
+        "Python is not installed as a framework. The Mac OS X backend will "
+        "not be able to function correctly if Python is not installed as a "
+        "framework. See the Python documentation for more information on "
+        "installing Python as a framework on Mac OS X. Please either reinstall "
+        "Python as a framework, or try one of the other backends. If you are "
+        "using (Ana)Conda please install python.app and replace the use of "
+        "'python' with 'pythonw'. See 'Working with Matplotlib on OSX' in the "
+        "Matplotlib FAQ for more information.");
+    return false;
+}
+
+static bool lazy_init(void) {
     if (backend_inited) {
-        return;
+        return true;
     }
     backend_inited = true;
 
@@ -288,6 +320,10 @@ static void lazy_init(void) {
                                name: NSWorkspaceDidLaunchApplicationNotification
                              object: nil];
     [pool release];
+
+    if (!verify_framework()) return false;
+
+    return true;
 }
 
 static PyObject*
@@ -314,7 +350,7 @@ static CGFloat _get_device_scale(CGContextRef cr)
 static PyObject*
 FigureCanvas_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
-    lazy_init();
+    if (!lazy_init()) return NULL;
     FigureCanvas *self = (FigureCanvas*)type->tp_alloc(type, 0);
     if (!self) return NULL;
     self->view = [View alloc];
@@ -675,7 +711,7 @@ static CGFloat _get_device_scale(CGContextRef cr)
 static PyObject*
 FigureManager_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
-    lazy_init();
+    if (!lazy_init()) return NULL;
     Window* window = [Window alloc];
     if (!window) return NULL;
     FigureManager *self = (FigureManager*)type->tp_alloc(type, 0);
@@ -1111,7 +1147,7 @@ -(void)save_figure:(id)sender
 static PyObject*
 NavigationToolbar2_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
-    lazy_init();
+    if (!lazy_init()) return NULL;
     NavigationToolbar2Handler* handler = [NavigationToolbar2Handler alloc];
     if (!handler) return NULL;
     NavigationToolbar2 *self = (NavigationToolbar2*)type->tp_alloc(type, 0);
@@ -2372,7 +2408,7 @@ - (int)index
 static PyObject*
 Timer_new(PyTypeObject* type, PyObject *args, PyObject *kwds)
 {
-    lazy_init();
+    if (!lazy_init()) return NULL;
     Timer* self = (Timer*)type->tp_alloc(type, 0);
     if (!self) return NULL;
     self->timer = NULL;
@@ -2563,38 +2599,6 @@ static void context_cleanup(const void* info)
     Timer_new,                 /* tp_new */
 };
 
-static bool verify_framework(void)
-{
-#ifdef COMPILING_FOR_10_6
-    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-    NSRunningApplication* app = [NSRunningApplication currentApplication];
-    NSApplicationActivationPolicy activationPolicy = [app activationPolicy];
-    [pool release];
-    switch (activationPolicy) {
-        case NSApplicationActivationPolicyRegular:
-        case NSApplicationActivationPolicyAccessory:
-            return true;
-        case NSApplicationActivationPolicyProhibited:
-            break;
-    }
-#else
-    ProcessSerialNumber psn;
-    if (CGMainDisplayID()!=0
-     && GetCurrentProcess(&psn)==noErr
-     && SetFrontProcess(&psn)==noErr) return true;
-#endif
-    PyErr_SetString(PyExc_ImportError,
-        "Python is not installed as a framework. The Mac OS X backend will "
-        "not be able to function correctly if Python is not installed as a "
-        "framework. See the Python documentation for more information on "
-        "installing Python as a framework on Mac OS X. Please either reinstall "
-        "Python as a framework, or try one of the other backends. If you are "
-        "using (Ana)Conda please install python.app and replace the use of "
-        "'python' with 'pythonw'. See 'Working with Matplotlib on OSX' in the "
-        "Matplotlib FAQ for more information.");
-    return false;
-}
-
 static struct PyMethodDef methods[] = {
    {"event_loop_is_running",
     (PyCFunction)event_loop_is_running,
@@ -2644,9 +2648,6 @@ static bool verify_framework(void)
      || PyType_Ready(&TimerType) < 0)
         return NULL;
 
-    if (!verify_framework())
-        return NULL;
-
     module = PyModule_Create(&moduledef);
     if (!module)
         return NULL;
