Remove some boilerplate from C extension inits.

- Trailing NULL fields in PyModuleDefs can be left unfilled (they will
  be filled with NULLs both in C and in C++, and this is also what
  https://docs.python.org/3/extending/extending.html#a-simple-example
  does).
- Empty docstrings should be set to NULL (None), not "".
- If no postprocessing is done, the return value of PyModule_Create can
  be returned directly without checking for NULL (NULL will just
  pass-though).

Author: anntzer

src/_backend_agg_wrapper.cpp

@@ -638,17 +638,7 @@ static PyTypeObject *PyRendererAgg_init_type(PyObject *m, PyTypeObject *type)
     return type;
 }
 
-static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT,
-    "_backend_agg",
-    NULL,
-    0,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL
-};
+static struct PyModuleDef moduledef = { PyModuleDef_HEAD_INIT, "_backend_agg" };
 
 #pragma GCC visibility push(default)
 

src/_c_internal_utils.c

@@ -211,7 +211,8 @@ static PyMethodDef functions[] = {
      "On non-Windows platforms, does nothing."},
     {NULL, NULL}};  // sentinel.
 static PyModuleDef util_module = {
-    PyModuleDef_HEAD_INIT, "_c_internal_utils", "", 0, functions, NULL, NULL, NULL, NULL};
+    PyModuleDef_HEAD_INIT, "_c_internal_utils", NULL, 0, functions
+};
 
 #pragma GCC visibility push(default)
 PyMODINIT_FUNC PyInit__c_internal_utils(void)

src/_contour_wrapper.cpp

@@ -152,17 +152,7 @@ static PyTypeObject* PyQuadContourGenerator_init_type(PyObject* m, PyTypeObject*
 
 /* Module */
 
-static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT,
-    "_contour",
-    NULL,
-    0,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL
-};
+static struct PyModuleDef moduledef = { PyModuleDef_HEAD_INIT, "_contour" };
 
 #pragma GCC visibility push(default)
 

src/_image_wrapper.cpp

@@ -295,15 +295,7 @@ static PyMethodDef module_functions[] = {
 };
 
 static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT,
-    "_image",
-    NULL,
-    0,
-    module_functions,
-    NULL,
-    NULL,
-    NULL,
-    NULL
+    PyModuleDef_HEAD_INIT, "_image", NULL, 0, module_functions,
 };
 
 #pragma GCC visibility push(default)

src/_macosx.m

@@ -2295,15 +2295,7 @@ static void context_cleanup(const void* info)
 };
 
 static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT,
-    "_macosx",
-    "Mac OS X native backend",
-    -1,
-    methods,
-    NULL,
-    NULL,
-    NULL,
-    NULL
+    PyModuleDef_HEAD_INIT, "_macosx", "Mac OS X native backend", -1, methods
 };
 
 #pragma GCC visibility push(default)

src/_path_wrapper.cpp

@@ -892,32 +892,15 @@ static PyMethodDef module_functions[] = {
 };
 
 static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT,
-    "_path",
-    NULL,
-    0,
-    module_functions,
-    NULL,
-    NULL,
-    NULL,
-    NULL
+    PyModuleDef_HEAD_INIT, "_path", NULL, 0, module_functions
 };
 
 #pragma GCC visibility push(default)
 
 PyMODINIT_FUNC PyInit__path(void)
 {
-    PyObject *m;
-
     import_array();
-
-    m = PyModule_Create(&moduledef);
-
-    if (m == NULL) {
-        return NULL;
-    }
-
-    return m;
+    return PyModule_Create(&moduledef);
 }
 
 #pragma GCC visibility pop

src/_tkagg.cpp

@@ -336,7 +336,7 @@ void load_tkinter_funcs(void)
 #endif // end not Windows
 
 static PyModuleDef _tkagg_module = {
-    PyModuleDef_HEAD_INIT, "_tkagg", "", -1, functions, NULL, NULL, NULL, NULL
+    PyModuleDef_HEAD_INIT, "_tkagg", NULL, -1, functions
 };
 
 #pragma GCC visibility push(default)

src/_ttconv.cpp

@@ -184,19 +184,14 @@ static PyModuleDef ttconv_module = {
     module_docstring,
     -1,
     ttconv_methods,
-    NULL, NULL, NULL, NULL
 };
 
 #pragma GCC visibility push(default)
 
 PyMODINIT_FUNC
 PyInit__ttconv(void)
 {
-    PyObject* m;
-
-    m = PyModule_Create(&ttconv_module);
-
-    return m;
+    return PyModule_Create(&ttconv_module);
 }
 
 #pragma GCC visibility pop

src/ft2font_wrapper.cpp

@@ -1533,17 +1533,7 @@ static PyTypeObject *PyFT2Font_init_type(PyObject *m, PyTypeObject *type)
     return type;
 }
 
-static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT,
-    "ft2font",
-    NULL,
-    0,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL
-};
+static struct PyModuleDef moduledef = { PyModuleDef_HEAD_INIT, "ft2font" };
 
 #pragma GCC visibility push(default)
 

src/qhull_wrap.cpp

@@ -308,29 +308,16 @@ static PyMethodDef qhull_methods[] = {
 
 static struct PyModuleDef qhull_module = {
     PyModuleDef_HEAD_INIT,
-    "qhull",
-    "Computing Delaunay triangulations.\n",
-    -1,
-    qhull_methods,
-    NULL, NULL, NULL, NULL
+    "qhull", "Computing Delaunay triangulations.\n", -1, qhull_methods
 };
 
 #pragma GCC visibility push(default)
 
 PyMODINIT_FUNC
 PyInit__qhull(void)
 {
-    PyObject* m;
-
     import_array();
-
-    m = PyModule_Create(&qhull_module);
-
-    if (m == NULL) {
-        return NULL;
-    }
-
-    return m;
+    return PyModule_Create(&qhull_module);
 }
 
 #pragma GCC visibility pop