Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Multi-phase init for more extensions

Browse Source
This commit is contained in:
Kovid Goyal 2020-10-24 14:51:05 +05:30
parent e02ae467a7
commit 76659d4b70
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
4 changed files with 64 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/calibre/library/sqlite_custom.c
View File

@ -273,22 +273,17 @@ static PyMethodDef sqlite_custom_methods[] = {
{NULL, NULL, 0, NULL}
};
static struct PyModuleDef sqlite_custom_module = {
/* m_base */ PyModuleDef_HEAD_INIT,
/* m_name */ "sqlite_custom",
/* m_doc */ sqlite_custom_doc,
/* m_size */ -1,
/* m_methods */ sqlite_custom_methods,
/* m_slots */ 0,
/* m_traverse */ 0,
/* m_clear */ 0,
/* m_free */ 0,
static int
exec_module(PyObject *module) { return 0; }
static PyModuleDef_Slot slots[] = { {Py_mod_exec, exec_module}, {0, NULL} };
static struct PyModuleDef module_def = {
.m_base = PyModuleDef_HEAD_INIT,
.m_name = "sqlite_custom",
.m_doc = sqlite_custom_doc,
.m_methods = sqlite_custom_methods,
.m_slots = slots,
};
CALIBRE_MODINIT_FUNC PyInit_sqlite_custom(void) {
PyObject *m;
m = PyModule_Create(&sqlite_custom_module);
if (m == NULL) {
return NULL;
}
return m;
}
CALIBRE_MODINIT_FUNC PyInit_sqlite_custom(void) { return PyModuleDef_Init(&module_def); }

53
src/calibre/utils/fonts/freetype.cpp
View File

@ -288,47 +288,34 @@ static PyTypeObject FreeTypeType = { // {{{
static char freetype_doc[] = "Interface to freetype";
static PyMethodDef freetype_methods[] = {
{NULL, NULL, 0, NULL}
};
static struct PyModuleDef freetype_module = {
/* m_base */ PyModuleDef_HEAD_INIT,
/* m_name */ "freetype",
/* m_doc */ freetype_doc,
/* m_size */ -1,
/* m_methods */ freetype_methods,
/* m_slots */ 0,
/* m_traverse */ 0,
/* m_clear */ 0,
/* m_free */ 0,
};
CALIBRE_MODINIT_FUNC PyInit_freetype(void) {
PyObject *m;
static int
exec_module(PyObject *m) {
FreeTypeType.tp_new = PyType_GenericNew;
if (PyType_Ready(&FreeTypeType) < 0) {
return NULL;
}
if (PyType_Ready(&FreeTypeType) < 0) return -1;
FaceType.tp_new = PyType_GenericNew;
if (PyType_Ready(&FaceType) < 0) {
return NULL;
}
m = PyModule_Create(&freetype_module);
if (m == NULL) {
return NULL;
}
if (PyType_Ready(&FaceType) < 0) return -1;
FreeTypeError = PyErr_NewException((char*)"freetype.FreeTypeError", NULL, NULL);
if (FreeTypeError == NULL) {
return NULL;
}
if (FreeTypeError == NULL) return -1;
PyModule_AddObject(m, "FreeTypeError", FreeTypeError);
Py_INCREF(&FreeTypeType);
PyModule_AddObject(m, "FreeType", (PyObject *)&FreeTypeType);
Py_INCREF(&FaceType);
PyModule_AddObject(m, "Face", (PyObject *)&FaceType);
return m;
return 0;
}
static PyModuleDef_Slot slots[] = { {Py_mod_exec, (void*)exec_module}, {0, NULL} };
static struct PyModuleDef module_def = {0};
CALIBRE_MODINIT_FUNC PyInit_freetype(void) {
module_def.m_base = PyModuleDef_HEAD_INIT;
module_def.m_name = "freetype";
module_def.m_doc = freetype_doc;
module_def.m_slots = slots;
return PyModuleDef_Init(&module_def);
}

38
src/calibre/utils/lzx/lzxmodule.c
View File

@ -203,27 +203,9 @@ static PyMethodDef lzx_methods[] = {
{ NULL }
};
static struct PyModuleDef lzx_module = {
/* m_base */ PyModuleDef_HEAD_INIT,
/* m_name */ "lzx",
/* m_doc */ lzx_doc,
/* m_size */ -1,
/* m_methods */ lzx_methods,
/* m_slots */ 0,
/* m_traverse */ 0,
/* m_clear */ 0,
/* m_free */ 0,
};
CALIBRE_MODINIT_FUNC PyInit_lzx(void) {
if (PyType_Ready(&CompressorType) < 0) {
return NULL;
}
PyObject *m = PyModule_Create(&lzx_module);
if (m == NULL) {
return NULL;
}
static int
exec_module(PyObject *m) {
if (PyType_Ready(&CompressorType) < 0) return -1;
LZXError = PyErr_NewException("lzx.LZXError", NULL, NULL);
Py_INCREF(LZXError);
@ -232,5 +214,17 @@ CALIBRE_MODINIT_FUNC PyInit_lzx(void) {
Py_INCREF(&CompressorType);
PyModule_AddObject(m, "Compressor", (PyObject *)&CompressorType);
return m;
return 0;
}
static PyModuleDef_Slot slots[] = { {Py_mod_exec, exec_module}, {0, NULL} };
static struct PyModuleDef module_def = {
.m_base = PyModuleDef_HEAD_INIT,
.m_name = "lzx",
.m_doc = lzx_doc,
.m_methods = lzx_methods,
.m_slots = slots,
};
CALIBRE_MODINIT_FUNC PyInit_lzx(void) { return PyModuleDef_Init(&module_def); }

34
src/calibre/utils/msdes/msdesmodule.c
View File

@ -77,29 +77,25 @@ static PyMethodDef msdes_methods[] = {
{ NULL, NULL }
};
static struct PyModuleDef msdes_module = {
/* m_base */ PyModuleDef_HEAD_INIT,
/* m_name */ "msdes",
/* m_doc */ msdes_doc,
/* m_size */ -1,
/* m_methods */ msdes_methods,
/* m_slots */ 0,
/* m_traverse */ 0,
/* m_clear */ 0,
/* m_free */ 0,
};
CALIBRE_MODINIT_FUNC PyInit_msdes(void) {
PyObject *m = PyModule_Create(&msdes_module);
if (m == NULL) {
return NULL;
}
static int
exec_module(PyObject *m) {
MsDesError = PyErr_NewException("msdes.MsDesError", NULL, NULL);
Py_INCREF(MsDesError);
PyModule_AddObject(m, "MsDesError", MsDesError);
PyModule_AddObject(m, "EN0", PyLong_FromLong(EN0));
PyModule_AddObject(m, "DE1", PyLong_FromLong(DE1));
return m;
return 0;
}
static PyModuleDef_Slot slots[] = { {Py_mod_exec, exec_module}, {0, NULL} };
static struct PyModuleDef module_def = {
.m_base = PyModuleDef_HEAD_INIT,
.m_name = "msdes",
.m_doc = msdes_doc,
.m_methods = msdes_methods,
.m_slots = slots,
};
CALIBRE_MODINIT_FUNC PyInit_msdes(void) { return PyModuleDef_Init(&module_def); }