@@ -56,20 +56,15 @@ def build_and_import_extension(
5656if include_dirs is None :
5757include_dirs = []
5858body = prologue + _make_methods (functions ,modname )
59- init = """
60- PyObject *mod = PyModule_Create(&moduledef);
61- #ifdef Py_GIL_DISABLED
62- PyUnstable_Module_SetGIL(mod, Py_MOD_GIL_NOT_USED);
63- #endif
64- """
59+ init = ""
6560if not build_dir :
6661build_dir = pathlib .Path ('.' )
6762if more_init :
6863init += """#define INITERROR return NULL
6964 """
7065init += more_init
71- init += "\n returnmod ;"
72- source_string = _make_source (modname ,init ,body )
66+ init += "\n return0 ;"
67+ source_string = _make_source (modname ,init ,body , modname )
7368mod_so = compile_extension_module (
7469modname ,build_dir ,include_dirs ,source_string )
7570import importlib .util
@@ -154,31 +149,45 @@ def _make_methods(functions, modname):
154149 %(methods)s
155150 { NULL }
156151 };
157- static struct PyModuleDef moduledef = {
158- PyModuleDef_HEAD_INIT,
159- "%(modname)s", /* m_name */
160- NULL, /* m_doc */
161- -1, /* m_size */
162- methods, /* m_methods */
163- };
164- """ % {'methods' :'\n ' .join (methods_table ),'modname' :modname }
152+ """ % {'methods' :'\n ' .join (methods_table )}
165153return body
166154
167155
168- def _make_source (name ,init ,body ):
156+ def _make_source (name ,init ,body , modname ):
169157""" Combines the code fragments into source code ready to be compiled
170158 """
171159code = """
172160 #include <Python.h>
173161
174162 %(body)s
175163
164+ static int
165+ %(name)s_exec(PyObject *m) {
166+ %(init)s
167+ }
168+
169+ static struct PyModuleDef_Slot %(name)s_slots[] = {
170+ {Py_mod_exec, %(name)s_exec},
171+ {Py_mod_multiple_interpreters, Py_MOD_MULTIPLE_INTERPRETERS_NOT_SUPPORTED},
172+ // signal this module supports running with the GIL disabled
173+ {Py_mod_gil, Py_MOD_GIL_NOT_USED},
174+ {0, NULL},
175+ };
176+
177+ static struct PyModuleDef moduledef = {
178+ .m_base = PyModuleDef_HEAD_INIT,
179+ .m_name = "%(modname)s",
180+ .m_size = 0,
181+ .m_methods = methods,
182+ .m_slots = %(name)s_slots,
183+ };
184+
176185 PyMODINIT_FUNC
177186 PyInit_%(name)s(void) {
178- %(init)s
187+ return PyModuleDef_Init(&moduledef);
179188 }
180189 """ % {
181- 'name' :name ,'init' :init ,'body' :body ,
190+ 'name' :name ,'init' :init ,'body' :body ,'modname' : modname ,
182191 }
183192return code
184193