Skip to content

Use PEP 489 multi-phase initialization #8983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use PEP 489 multi-phase initialization #8983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions src/_avif.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,26 +881,22 @@ setup_module(PyObject *m) {
return 0;
}

static PyModuleDef_Slot slots[] = {
{Py_mod_exec, setup_module},
#ifdef Py_GIL_DISABLED
{Py_mod_gil, Py_MOD_GIL_NOT_USED},
#endif
{0, NULL}
};

PyMODINIT_FUNC
PyInit__avif(void) {
PyObject *m;

static PyModuleDef module_def = {
PyModuleDef_HEAD_INIT,
.m_name = "_avif",
.m_size = -1,
.m_methods = avifMethods,
.m_slots = slots
};

m = PyModule_Create(&module_def);
if (setup_module(m) < 0) {
Py_DECREF(m);
return NULL;
}

#ifdef Py_GIL_DISABLED
PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED);
#endif

return m;
return PyModuleDef_Init(&module_def);
}
25 changes: 10 additions & 15 deletions src/_imaging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4460,27 +4460,22 @@ setup_module(PyObject *m) {
return 0;
}

static PyModuleDef_Slot slots[] = {
{Py_mod_exec, setup_module},
#ifdef Py_GIL_DISABLED
{Py_mod_gil, Py_MOD_GIL_NOT_USED},
#endif
{0, NULL}
};

PyMODINIT_FUNC
PyInit__imaging(void) {
PyObject *m;

static PyModuleDef module_def = {
PyModuleDef_HEAD_INIT,
.m_name = "_imaging",
.m_size = -1,
.m_methods = functions,
.m_slots = slots
};

m = PyModule_Create(&module_def);

if (setup_module(m) < 0) {
Py_DECREF(m);
return NULL;
}

#ifdef Py_GIL_DISABLED
PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED);
#endif

return m;
return PyModuleDef_Init(&module_def);
}
26 changes: 11 additions & 15 deletions src/_imagingcms.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1463,28 +1463,24 @@ setup_module(PyObject *m) {
return 0;
}

static PyModuleDef_Slot slots[] = {
{Py_mod_exec, setup_module},
#ifdef Py_GIL_DISABLED
{Py_mod_gil, Py_MOD_GIL_NOT_USED},
#endif
{0, NULL}
};

PyMODINIT_FUNC
PyInit__imagingcms(void) {
PyObject *m;
PyDateTime_IMPORT;

static PyModuleDef module_def = {
PyModuleDef_HEAD_INIT,
.m_name = "_imagingcms",
.m_size = -1,
.m_methods = pyCMSdll_methods,
.m_slots = slots
};

m = PyModule_Create(&module_def);

if (setup_module(m) < 0) {
return NULL;
}

PyDateTime_IMPORT;

#ifdef Py_GIL_DISABLED
PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED);
#endif

return m;
return PyModuleDef_Init(&module_def);
}
24 changes: 10 additions & 14 deletions src/_imagingft.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1599,26 +1599,22 @@ setup_module(PyObject *m) {
return 0;
}

static PyModuleDef_Slot slots[] = {
{Py_mod_exec, setup_module},
#ifdef Py_GIL_DISABLED
{Py_mod_gil, Py_MOD_GIL_NOT_USED},
#endif
{0, NULL}
};

PyMODINIT_FUNC
PyInit__imagingft(void) {
PyObject *m;

static PyModuleDef module_def = {
PyModuleDef_HEAD_INIT,
.m_name = "_imagingft",
.m_size = -1,
.m_methods = _functions,
.m_slots = slots
};

m = PyModule_Create(&module_def);

if (setup_module(m) < 0) {
return NULL;
}

#ifdef Py_GIL_DISABLED
PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED);
#endif

return m;
return PyModuleDef_Init(&module_def);
}
24 changes: 10 additions & 14 deletions src/_imagingmath.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,26 +302,22 @@ setup_module(PyObject *m) {
return 0;
}

static PyModuleDef_Slot slots[] = {
{Py_mod_exec, setup_module},
#ifdef Py_GIL_DISABLED
{Py_mod_gil, Py_MOD_GIL_NOT_USED},
#endif
{0, NULL}
};

PyMODINIT_FUNC
PyInit__imagingmath(void) {
PyObject *m;

static PyModuleDef module_def = {
PyModuleDef_HEAD_INIT,
.m_name = "_imagingmath",
.m_size = -1,
.m_methods = _functions,
.m_slots = slots
};

m = PyModule_Create(&module_def);

if (setup_module(m) < 0) {
return NULL;
}

#ifdef Py_GIL_DISABLED
PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED);
#endif

return m;
return PyModuleDef_Init(&module_def);
}
19 changes: 9 additions & 10 deletions src/_imagingmorph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,23 +246,22 @@ static PyMethodDef functions[] = {
{NULL, NULL, 0, NULL}
};

static PyModuleDef_Slot slots[] = {
#ifdef Py_GIL_DISABLED
{Py_mod_gil, Py_MOD_GIL_NOT_USED},
#endif
{0, NULL}
};

PyMODINIT_FUNC
PyInit__imagingmorph(void) {
PyObject *m;

static PyModuleDef module_def = {
PyModuleDef_HEAD_INIT,
.m_name = "_imagingmorph",
.m_doc = "A module for doing image morphology",
.m_size = -1,
.m_methods = functions,
.m_slots = slots
};

m = PyModule_Create(&module_def);

#ifdef Py_GIL_DISABLED
PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED);
#endif

return m;
return PyModuleDef_Init(&module_def);
}
22 changes: 10 additions & 12 deletions src/_imagingtk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,24 +46,22 @@ static PyMethodDef functions[] = {
{NULL, NULL} /* sentinel */
};

static PyModuleDef_Slot slots[] = {
{Py_mod_exec, load_tkinter_funcs},
#ifdef Py_GIL_DISABLED
{Py_mod_gil, Py_MOD_GIL_NOT_USED},
#endif
{0, NULL}
};

PyMODINIT_FUNC
PyInit__imagingtk(void) {
static PyModuleDef module_def = {
PyModuleDef_HEAD_INIT,
.m_name = "_imagingtk",
.m_size = -1,
.m_methods = functions,
.m_slots = slots
};
PyObject *m;
m = PyModule_Create(&module_def);
if (load_tkinter_funcs() != 0) {
Py_DECREF(m);
return NULL;
}

#ifdef Py_GIL_DISABLED
PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED);
#endif

return m;
return PyModuleDef_Init(&module_def);
}
24 changes: 10 additions & 14 deletions src/_webp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,26 +777,22 @@ setup_module(PyObject *m) {
return 0;
}

static PyModuleDef_Slot slots[] = {
{Py_mod_exec, setup_module},
#ifdef Py_GIL_DISABLED
{Py_mod_gil, Py_MOD_GIL_NOT_USED},
#endif
{0, NULL}
};

PyMODINIT_FUNC
PyInit__webp(void) {
PyObject *m;

static PyModuleDef module_def = {
PyModuleDef_HEAD_INIT,
.m_name = "_webp",
.m_size = -1,
.m_methods = webpMethods,
.m_slots = slots
};

m = PyModule_Create(&module_def);
if (setup_module(m) < 0) {
Py_DECREF(m);
return NULL;
}

#ifdef Py_GIL_DISABLED
PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED);
#endif

return m;
return PyModuleDef_Init(&module_def);
}
Loading