8000 Merge pull request #20872 from anntzer/extinit · matplotlib/matplotlib@63de810 · GitHub
[go: up one dir, main page]
Skip to content

Commit 63de810

Browse files
tacaswelltacaswell
authored
Merge pull request #20872 from anntzer/extinit
MNT: Remove some boilerplate from C extension inits.
2 parents 5356a48 + 68d8144 commit 63de810

11 files changed

+14
-107
lines changed

‎src/_backend_agg_wrapper.cpp

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -638,17 +638,7 @@ static PyTypeObject *PyRendererAgg_init_type(PyObject *m, PyTypeObject *type)
638638
return type;
639639
}
640640

641-
static struct PyModuleDef moduledef = {
642-
PyModuleDef_HEAD_INIT,
643-
"_backend_agg",
644-
NULL,
645-
0,
646-
NULL,
647-
NULL,
648-
NULL,
649-
NULL,
650-
NULL
651-
};
641+
static struct PyModuleDef moduledef = { PyModuleDef_HEAD_INIT, "_backend_agg" };
652642

653643
#pragma GCC visibility push(default)
654644

‎src/_c_internal_utils.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,8 @@ static PyMethodDef functions[] = {
211211
"On non-Windows platforms, does nothing."},
212212
{NULL, NULL}}; // sentinel.
213213
static PyModuleDef util_module = {
214-
PyModuleDef_HEAD_INIT, "_c_internal_utils", "", 0, functions, NULL, NULL, NULL, NULL};
214+
PyModuleDef_HEAD_INIT, "_c_internal_utils", NULL, 0, functions
215+
};
215216

216217
#pragma GCC visibility push(default)
217218
PyMODINIT_FUNC PyInit__c_internal_utils(void)

‎src/_contour_wrapper.cpp

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -152,17 +152,7 @@ static PyTypeObject* PyQuadContourGenerator_init_type(PyObject* m, PyTypeObject*
152152

153153
/* Module */
154154

155-
static struct PyModuleDef moduledef = {
156-
PyModuleDef_HEAD_INIT,
157-
"_contour",
158-
NULL,
159-
0,
160-
NULL,
161-
NULL,
162-
NULL,
163-
NULL,
164-
NULL
165-
};
155+
static struct PyModuleDef moduledef = { PyModuleDef_HEAD_INIT, "_contour" };
166156

167157
#pragma GCC visibility push(default)
168158

‎src/_image_wrapper.cpp

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -295,15 +295,7 @@ static PyMethodDef module_functions[] = {
295295
};
296296

297297
static struct PyModuleDef moduledef = {
298-
PyModuleDef_HEAD_INIT,
299-
"_image",
300-
NULL,
301-
0,
302-
module_functions,
303-
NULL,
304-
NULL,
305-
NULL,
306-
NULL
298+
PyModuleDef_HEAD_INIT, "_image", NULL, 0, module_functions,
307299
};
308300

309301
#pragma GCC visibility push(default)

‎src/_macosx.m

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2295,15 +2295,7 @@ static void context_cleanup(const void* info)
22952295
};
22962296

22972297
static struct PyModuleDef moduledef = {
2298-
PyModuleDef_HEAD_INIT,
2299-
"_macosx",
2300-
"Mac OS X native backend",
2301-
-1,
2302-
methods,
2303-
NULL,
2304-
NULL,
2305-
NULL,
2306-
NULL
2298+
PyModuleDef_HEAD_INIT, "_macosx", "Mac OS X native backend", -1, methods
23072299
};
23082300

23092301
#pragma GCC visibility push(default)

‎src/_path_wrapper.cpp

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -892,32 +892,15 @@ static PyMethodDef module_functions[] = {
892892
};
893893

894894
static struct PyModuleDef moduledef = {
895-
PyModuleDef_HEAD_INIT,
896-
"_path",
897-
NULL,
898-
0,
899-
module_functions,
900-
NULL,
901-
NULL,
902-
NULL,
903-
NULL
895+
PyModuleDef_HEAD_INIT, "_path", NULL, 0, module_functions
904896
};
905897

906898
#pragma GCC visibility push(default)
907899

908900
PyMODINIT_FUNC PyInit__path(void)
909901
{
910-
PyObject *m;
911-
912902
import_array();
913-
914-
m = PyModule_Create(&moduledef);
915-
916-
if (m == NULL) {
917-
return NULL;
918-
}
919-
920-
return m;
903+
return PyModule_Create(&moduledef);
921904
}
922905

923906
#pragma GCC visibility pop

‎src/_tkagg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ void load_tkinter_funcs(void)
336336
#endif // end not Windows
337337

338338
static PyModuleDef _tkagg_module = {
339-
PyModuleDef_HEAD_INIT, "_tkagg", "", -1, functions, NULL, NULL, NULL, NULL
339+
PyModuleDef_HEAD_INIT, "_tkagg", NULL, -1, functions
340340
};
341341

342342
#pragma GCC visibility push(default)

‎src/_ttconv.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,19 +184,14 @@ static PyModuleDef ttconv_module = {
184184
module_docstring,
185185
-1,
186186
ttconv_methods,
187-
NULL, NULL, NULL, NULL
188187
};
189188

190189
#pragma GCC visibility push(default)
191190

192191
PyMODINIT_FUNC
193192
PyInit__ttconv(void)
194193
{
195-
PyObject* m;
196-
197-
m = PyModule_Create(&ttconv_module);
198-
199-
return m;
194+
return PyModule_Create(&ttconv_module);
200195
}
201196

202197
#pragma GCC visibility pop

‎src/ft2font_wrapper.cpp

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,17 +1533,7 @@ static PyTypeObject *PyFT2Font_init_type(PyObject *m, PyTypeObject *type)
15331533
return type;
15341534
}
15351535

1536-
static struct PyModuleDef moduledef = {
1537-
PyModuleDef_HEAD_INIT,
1538-
"ft2font",
1539-
NULL,
1540-
0,
1541-
NULL,
1542-
NULL,
1543-
NULL,
1544-
NULL,
1545-
NULL
1546-
};
1536+
static struct PyModuleDef moduledef = { PyModuleDef_HEAD_INIT, "ft2font" };
15471537

15481538
#pragma GCC visibility push(default)
15491539

‎src/qhull_wrap.cpp

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -308,29 +308,16 @@ static PyMethodDef qhull_methods[] = {
308308

309309
static struct PyModuleDef qhull_module = {
310310
PyModuleDef_HEAD_INIT,
311-
"qhull",
312-
"Computing Delaunay triangulations.\n",
313-
-1,
314-
qhull_methods,
315-
NULL, NULL, NULL, NULL
311+
"qhull", "Computing Delaunay triangulations.\n", -1, qhull_methods
316312
};
317313

318314
#pragma GCC visibility push(default)
319315

320316
PyMODINIT_FUNC
321317
PyInit__qhull(void)
322318
{
323-
PyObject* m;
324-
325319
import_array();
326-
327-
m = PyModule_Create(&qhull_module);
328-
329-
if (m == NULL) {
330-
return NULL;
331-
}
332-
333-
return m;
320+
return PyModule_Create(&qhull_module);
334321
}
335322

336323
#pragma GCC visibility pop

‎src/tri/_tri_wrapper.cpp

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -489,20 +489,7 @@ static PyTypeObject* PyTrapezoidMapTriFinder_init_type(PyObject* m, PyTypeObject
489489
return type;
490490
}
491491

492-
493-
/* Module */
494-
495-
static struct PyModuleDef moduledef = {
496-
PyModuleDef_HEAD_INIT,
497-
"_tri",
498-
NULL,
499-
0,
500-
NULL,
501-
NULL,
502-
NULL,
503-
NULL,
504-
NULL
505-
};
492+
static struct PyModuleDef moduledef = { PyModuleDef_HEAD_INIT, "_tri" };
506493

507494
#pragma GCC visibility push(default)
508495

0 commit comments

Comments
 (0)
0