Matplotlib requires Python 3.6, which in turn requires Mac OS X 10.6+

joelfrederico · joelfrederico · commit 6df2e0f65a59 · 2019-08-08T12:30:28.000-07:00
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -11,9 +11,6 @@
 
 /* Proper way to check for the OS X version we are compiling for, from
    http://developer.apple.com/documentation/DeveloperTools/Conceptual/cross_development */
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
-#define COMPILING_FOR_10_6
-#endif
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
 #define COMPILING_FOR_10_7
 #endif
@@ -204,11 +201,7 @@ - (void)masterCloses:(NSNotification*)notification;
 - (void)close;
 @end
 
-#ifdef COMPILING_FOR_10_6
 @interface View : NSView <NSWindowDelegate>
-#else
-@interface View : NSView
-#endif
 {   PyObject* canvas;
     NSRect rubberband;
     BOOL inside;
@@ -1379,29 +1372,21 @@ -(void)save_figure:(id)sender
         [[NSString alloc]
          initWithCString: default_filename
          encoding: NSUTF8StringEncoding];
-#ifdef COMPILING_FOR_10_6
     [panel setNameFieldStringValue: ns_default_filename];
     result = [panel runModal];
-#else
-    result = [panel runModalForDirectory: nil file: ns_default_filename];
-#endif
     [ns_default_filename release];
 #ifdef COMPILING_FOR_10_10
     if (result == NSModalResponseOK)
 #else
     if (result == NSOKButton)
 #endif
     {
-#ifdef COMPILING_FOR_10_6
         NSURL* url = [panel URL];
         NSString* filename = [url path];
         if (!filename) {
             PyErr_SetString(PyExc_RuntimeError, "Failed to obtain filename");
             return 0;
         }
-#else
-        NSString* filename = [panel filename];
-#endif
         unsigned int n = [filename length];
         unichar* buffer = malloc(n*sizeof(unichar));
         [filename getCharacters: buffer];
@@ -2581,26 +2566,6 @@ static void context_cleanup(const void* info)
     Timer_new,                 /* tp_new */
 };
 
-#ifndef COMPILING_FOR_10_6
-static bool verify_framework(void)
-{
-    ProcessSerialNumber psn;
-    if (CGMainDisplayID()!=0
-     && GetCurrentProcess(&psn)==noErr
-     && SetFrontProcess(&psn)==noErr) return true;
-    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;
-}
-#endif
-
 static struct PyMethodDef methods[] = {
    {"event_loop_is_running",
     (PyCFunction)event_loop_is_running,
@@ -2650,12 +2615,6 @@ static bool verify_framework(void)
      || PyType_Ready(&TimerType) < 0)
         return NULL;
 
-#ifndef COMPILING_FOR_10_6
-    /* if >=10.6 invoke setActivationPolicy in lazy_init */
-    if (!verify_framework())
-        return NULL;
-#endif
-
     module = PyModule_Create(&moduledef);
     if (!module)
         return NULL;
