Merge pull request #11890 from meeseeksmachine/auto-backport-of-pr-11850-on-v3.0.x

QuLogic · web-flow · commit 6ba056215633 · 2018-08-19T18:29:39.000-04:00
Backport PR #11850 on branch v3.0.x
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -2565,24 +2565,12 @@ static void context_cleanup(const void* info)
 
 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;
+    /* These methods are deprecated, but they don't require the app to
+       have started  */
     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 "
