gryf/wmdocklib
1
0
Fork 0
mirror of https://github.com/gryf/wmdocklib.git synced 2025-12-19 04:20:17 +01:00
Code Issues Projects Releases Wiki Activity

Adopt C code to python3.

Browse Source
This commit is contained in:
gryf
2022-04-09 11:35:20 +02:00
parent 1f9b63ffcd
commit 12fe776ec3
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
wmdocklib/pywmgeneral.c
View File

@@ -83,11 +83,11 @@ char **pyListToStrs(PyObject *l) {
s = PySequence_GetItem(l, i); s = PySequence_GetItem(l, i);
if (s == NULL) if (s == NULL)
return NULL; /* Shouldn't happen. */ return NULL; /* Shouldn't happen. */
if (!PyString_Check(s)) { if (!PyUnicode_Check(s)) {
PyErr_SetString(PyExc_TypeError, "String expected."); PyErr_SetString(PyExc_TypeError, "String expected.");
return NULL; return NULL;
} }
target[i] = PyString_AsString(s); target[i] = PyUnicode_AsUTF8(s);
} }
return target; return target;
} }
@@ -379,7 +379,6 @@ static PyMethodDef Drawable_methods[] = {
static PyTypeObject drawable_DrawableType = { static PyTypeObject drawable_DrawableType = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, /*ob_size*/
"pyywmgeneral.Drawable", /*tp_name*/ "pyywmgeneral.Drawable", /*tp_name*/
sizeof(drawable_DrawableObject), /*tp_basicsize*/ sizeof(drawable_DrawableObject), /*tp_basicsize*/
0, /*tp_itemsize*/ 0, /*tp_itemsize*/
@@ -807,23 +806,33 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
} }
} }
static struct PyModuleDef pywmgeneral = {
PyModuleDef_HEAD_INIT,
"pywmgeneral",
"base C module for wmdocklib",
-1,
PyWmgeneralMethods
};
#ifndef PyMODINIT_FUNC /* declarations for DLL import/export */ #ifndef PyMODINIT_FUNC /* declarations for DLL import/export */
#define PyMODINIT_FUNC void #define PyMODINIT_FUNC void
#endif #endif
PyMODINIT_FUNC PyMODINIT_FUNC
initpywmgeneral(void) { PyInit_pywmgeneral(void) {
PyObject* m; PyObject* m;
drawable_DrawableType.tp_new = PyType_GenericNew; drawable_DrawableType.tp_new = PyType_GenericNew;
if (PyType_Ready(&drawable_DrawableType) < 0) if (PyType_Ready(&drawable_DrawableType) < 0)
return; return NULL;
m = Py_InitModule3("pywmgeneral", PyWmgeneralMethods, m = PyModule_Create(&pywmgeneral);
"base C module for wmdocklib");
if (m == NULL) if (m == NULL)
return; return NULL;
Py_INCREF(&drawable_DrawableType); Py_INCREF(&drawable_DrawableType);
/* Py_XINCREF(&drawable_DrawableType); */
PyModule_AddObject(m, "Drawable", (PyObject *)&drawable_DrawableType); PyModule_AddObject(m, "Drawable", (PyObject *)&drawable_DrawableType);
return m;
} }