Use designated initializers, inline entries.

Author: anntzer

src/_macosx.m

@@ -525,50 +525,49 @@ static CGFloat _get_device_scale(CGContextRef cr)
     Py_RETURN_NONE;
 }
 
-static PyMethodDef FigureCanvas_methods[] = {
-    {"draw",
-     (PyCFunction)FigureCanvas_draw,
-     METH_NOARGS,
-     NULL,  // docstring inherited.
+static PyTypeObject FigureCanvasType = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    .tp_name = "_macosx.FigureCanvas",
+    .tp_basicsize = sizeof(FigureCanvas),
+    .tp_dealloc = (destructor)FigureCanvas_dealloc,
+    .tp_repr = (reprfunc)FigureCanvas_repr,
+    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+    .tp_init = (initproc)FigureCanvas_init,
+    .tp_new = (newfunc)FigureCanvas_new,
+    .tp_doc = "A FigureCanvas object wraps a Cocoa NSView object.",
+    .tp_methods = (PyMethodDef[]){
+        {"draw",
+         (PyCFunction)FigureCanvas_draw,
+         METH_NOARGS,
+         NULL},  // docstring inherited
+        {"draw_idle",
+         (PyCFunction)FigureCanvas_draw_idle,
+         METH_NOARGS,
+         NULL},  // docstring inherited
+        {"flush_events",
+         (PyCFunction)FigureCanvas_flush_events,
+         METH_NOARGS,
+         NULL},  // docstring inherited
+        {"set_rubberband",
+         (PyCFunction)FigureCanvas_set_rubberband,
+         METH_VARARGS,
+         "Specifies a new rubberband rectangle and invalidates it."},
+        {"remove_rubberband",
+         (PyCFunction)FigureCanvas_remove_rubberband,
+         METH_NOARGS,
+         "Removes the current rubberband rectangle."},
+        {"start_event_loop",
+         (PyCFunction)FigureCanvas_start_event_loop,
+         METH_KEYWORDS | METH_VARARGS,
+         NULL},  // docstring inherited
+        {"stop_event_loop",
+         (PyCFunction)FigureCanvas_stop_event_loop,
+         METH_NOARGS,
+         NULL},  // docstring inherited
+        {}  // sentinel
     },
-    {"draw_idle",
-     (PyCFunction)FigureCanvas_draw_idle,
-     METH_NOARGS,
-     NULL,  // docstring inherited.
-    },
-    {"flush_events",
-     (PyCFunction)FigureCanvas_flush_events,
-     METH_NOARGS,
-     NULL,  // docstring inherited.
-    },
-    {"set_rubberband",
-     (PyCFunction)FigureCanvas_set_rubberband,
-     METH_VARARGS,
-     "Specifies a new rubberband rectangle and invalidates it."
-    },
-    {"remove_rubberband",
-     (PyCFunction)FigureCanvas_remove_rubberband,
-     METH_NOARGS,
-     "Removes the current rubberband rectangle."
-    },
-    {"start_event_loop",
-     (PyCFunction)FigureCanvas_start_event_loop,
-     METH_KEYWORDS | METH_VARARGS,
-     NULL,  // docstring inherited.
-    },
-    {"stop_event_loop",
-     (PyCFunction)FigureCanvas_stop_event_loop,
-     METH_NOARGS,
-     NULL,  // docstring inherited.
-    },
-    {NULL}  /* Sentinel */
 };
 
-static char FigureCanvas_doc[] =
-"A FigureCanvas object wraps a Cocoa NSView object.\n";
-
-static PyTypeObject FigureCanvasType;
-
 typedef struct {
     PyObject_HEAD
     Window* window;
@@ -739,42 +738,38 @@ static CGFloat _get_device_scale(CGContextRef cr)
     Py_RETURN_NONE;
 }
 
-static PyMethodDef FigureManager_methods[] = {
-    {"show",
-     (PyCFunction)FigureManager_show,
-     METH_NOARGS,
-     NULL,  // docstring inherited.
-    },
-    {"destroy",
-     (PyCFunction)FigureManager_destroy,
-     METH_NOARGS,
-     NULL,  // docstring inherited.
-    },
-    {"set_window_title",
-     (PyCFunction)FigureManager_set_window_title,
-     METH_VARARGS,
-     NULL,  // docstring inherited.
-    },
-    {"get_window_title",
-     (PyCFunction)FigureManager_get_window_title,
-     METH_NOARGS,
-     NULL,  // docstring inherited.
+static PyTypeObject FigureManagerType = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    .tp_name = "_macosx.FigureManager",
+    .tp_basicsize = sizeof(FigureManager),
+    .tp_dealloc = (destructor)FigureManager_dealloc,
+    .tp_repr = (reprfunc)FigureManager_repr,
+    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+    .tp_init = (initproc)FigureManager_init,
+    .tp_new = (newfunc)FigureManager_new,
+    .tp_doc = "A FigureManager object wraps a Cocoa NSWindow object.",
+    .tp_methods = (PyMethodDef[]){  // All docstrings are inherited.
+        {"show",
+         (PyCFunction)FigureManager_show,
+         METH_NOARGS},
+        {"destroy",
+         (PyCFunction)FigureManager_destroy,
+         METH_NOARGS},
+        {"set_window_title",
+         (PyCFunction)FigureManager_set_window_title,
+         METH_VARARGS},
+        {"get_window_title",
+         (PyCFunction)FigureManager_get_window_title,
+         METH_NOARGS},
+        {"resize",
+         (PyCFunction)FigureManager_resize,
+         METH_VARARGS},
+        {}  // sentinel
     },
-    {"resize",
-     (PyCFunction)FigureManager_resize,
-     METH_VARARGS,
-     NULL,  // docstring inherited.
-    },
-    {NULL}  /* Sentinel */
 };
 
-static char FigureManager_doc[] =
-"A FigureManager object wraps a Cocoa NSWindow object.\n";
-
-static PyTypeObject FigureManagerType;
-
-@interface NavigationToolbar2Handler : NSObject {
-    PyObject* toolbar;
+@interface NavigationToolbar2Handler : NSObject
+{   PyObject* toolbar;
     NSButton* panbutton;
     NSButton* zoombutton;
 }
@@ -1013,20 +1008,24 @@ -(void)save_figure:(id)sender { gil_call_method(toolbar, "save_figure"); }
     Py_RETURN_NONE;
 }
 
-static PyMethodDef NavigationToolbar2_methods[] = {
-    {"set_message",
-     (PyCFunction)NavigationToolbar2_set_message,
-     METH_VARARGS,
-     NULL,  // docstring inherited.
+static PyTypeObject NavigationToolbar2Type = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    .tp_name = "_macosx.NavigationToolbar2",
+    .tp_basicsize = sizeof(NavigationToolbar2),
+    .tp_dealloc = (destructor)NavigationToolbar2_dealloc,
+    .tp_repr = (reprfunc)NavigationToolbar2_repr,
+    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+    .tp_init = (initproc)NavigationToolbar2_init,
+    .tp_new = (newfunc)NavigationToolbar2_new,
+    .tp_doc = "NavigationToolbar2",
+    .tp_methods = (PyMethodDef[]){  // All docstrings are inherited.
+        {"set_message",
+         (PyCFunction)NavigationToolbar2_set_message,
+         METH_VARARGS},
+        {}  // sentinel
     },
-    {NULL}  /* Sentinel */
 };
 
-static char NavigationToolbar2_doc[] =
-"NavigationToolbar2\n";
-
-static PyTypeObject NavigationToolbar2Type;
-
 static PyObject*
 choose_save_file(PyObject* unused, PyObject* args)
 {
@@ -1867,99 +1866,56 @@ static void context_cleanup(const void* info)
     Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
-static char Timer_doc[] =
-"A Timer object wraps a CFRunLoopTimerRef and can add it to the event loop.\n";
-
-static PyMethodDef Timer_methods[] = {
-    {"_timer_start",
-     (PyCFunction)Timer__timer_start,
-     METH_VARARGS,
-     NULL,  // docstring inherited.
+static PyTypeObject TimerType = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    .tp_name = "_macosx.Timer",
+    .tp_basicsize = sizeof(Timer),
+    .tp_dealloc = (destructor)Timer_dealloc,
+    .tp_repr = (reprfunc)Timer_repr,
+    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+    .tp_new = (newfunc)Timer_new,
+    .tp_doc = "A Timer object wraps a CFRunLoopTimerRef and can add it to the event loop.",
+    .tp_methods = (PyMethodDef[]){  // All docstrings are inherited.
+        {"_timer_start",
+         (PyCFunction)Timer__timer_start,
+         METH_VARARGS},
+        {"_timer_stop",
+         (PyCFunction)Timer__timer_stop,
+         METH_NOARGS},
+        {}  // sentinel
     },
-    {"_timer_stop",
-     (PyCFunction)Timer__timer_stop,
-     METH_NOARGS,
-     NULL,  // docstring inherited.
-    },
-    {NULL}  /* Sentinel */
-};
-
-static PyTypeObject TimerType;
-
-static PyMethodDef methods[] = {
-   {"event_loop_is_running",
-    (PyCFunction)event_loop_is_running,
-    METH_NOARGS,
-    "Return whether the OSX backend has set up the NSApp main event loop."
-   },
-   {"show",
-    (PyCFunction)show,
-    METH_NOARGS,
-    "Show all the figures and enter the main loop.\n"
-    "\n"
-    "This function does not return until all Matplotlib windows are closed,\n"
-    "and is normally not needed in interactive sessions."
-   },
-   {"choose_save_file",
-    (PyCFunction)choose_save_file,
-    METH_VARARGS,
-    "Closes the window."
-   },
-   {"set_cursor",
-    (PyCFunction)set_cursor,
-    METH_VARARGS,
-    "Sets the active cursor."
-   },
-   {NULL, NULL, 0, NULL} /* sentinel */
 };
 
 static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT, "_macosx", "Mac OS X native backend", -1, methods
+    PyModuleDef_HEAD_INIT, "_macosx", "Mac OS X native backend", -1,
+    (PyMethodDef[]){
+        {"event_loop_is_running",
+         (PyCFunction)event_loop_is_running,
+         METH_NOARGS,
+         "Return whether the OSX backend has set up the NSApp main event loop."},
+        {"show",
+         (PyCFunction)show,
+         METH_NOARGS,
+         "Show all the figures and enter the main loop.\n"
+         "\n"
+         "This function does not return until all Matplotlib windows are closed,\n"
+         "and is normally not needed in interactive sessions."},
+        {"choose_save_file",
+         (PyCFunction)choose_save_file,
+         METH_VARARGS,
+         "Closes the window."},
+        {"set_cursor",
+         (PyCFunction)set_cursor,
+         METH_VARARGS,
+         "Sets the active cursor."},
+        {}  /* Sentinel */
+    },
 };
 
 #pragma GCC visibility push(default)
 
 PyObject* PyInit__macosx(void)
 {
-    FigureCanvasType.tp_name = "_macosx.FigureCanvas";
-    FigureCanvasType.tp_basicsize = sizeof(FigureCanvas);
-    FigureCanvasType.tp_dealloc = FigureCanvas_dealloc;
-    FigureCanvasType.tp_repr = FigureCanvas_repr;
-    FigureCanvasType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
-    FigureCanvasType.tp_doc = FigureCanvas_doc;
-    FigureCanvasType.tp_methods = FigureCanvas_methods;
-    FigureCanvasType.tp_init = FigureCanvas_init;
-    FigureCanvasType.tp_new = FigureCanvas_new;
-
-    FigureManagerType.tp_name = "_macosx.FigureManager";
-    FigureManagerType.tp_basicsize = sizeof(FigureManager);
-    FigureManagerType.tp_dealloc = FigureManager_dealloc;
-    FigureManagerType.tp_repr = FigureManager_repr;
-    FigureManagerType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
-    FigureManagerType.tp_doc = FigureManager_doc;
-    FigureManagerType.tp_methods = FigureManager_methods;
-    FigureManagerType.tp_init = FigureManager_init;
-    FigureManagerType.tp_new = FigureManager_new;
-
-    NavigationToolbar2Type.tp_name = "_macosx.NavigationToolbar2";
-    NavigationToolbar2Type.tp_basicsize = sizeof(NavigationToolbar2);
-    NavigationToolbar2Type.tp_dealloc = NavigationToolbar2_dealloc;
-    NavigationToolbar2Type.tp_repr = NavigationToolbar2_repr;
-    NavigationToolbar2Type.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
-    NavigationToolbar2Type.tp_doc = NavigationToolbar2_doc;
-    NavigationToolbar2Type.tp_methods = NavigationToolbar2_methods;
-    NavigationToolbar2Type.tp_init = NavigationToolbar2_init;
-    NavigationToolbar2Type.tp_new = NavigationToolbar2_new;
-
-    TimerType.tp_name = "_macosx.Timer";
-    TimerType.tp_basicsize = sizeof(Timer);
-    TimerType.tp_dealloc = Timer_dealloc;
-    TimerType.tp_repr = Timer_repr;
-    TimerType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
-    TimerType.tp_doc = Timer_doc;
-    TimerType.tp_methods = Timer_methods;
-    TimerType.tp_new = Timer_new;
-
     if (PyType_Ready(&FigureCanvasType) < 0
      || PyType_Ready(&FigureManagerType) < 0
      || PyType_Ready(&NavigationToolbar2Type) < 0