entrouvert
/
lasso
16
0
Fork 0
Code Issues Pull Requests 1 Releases Activity

Python 3: Fix the pygobject init macro and restore it

This commit is contained in:
Houzéfa Abbasbhay 2014-12-02 16:31:29 +01:00 committed by Benjamin Dauvergne
parent efc5429cfc
commit 8938f87220
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bindings/python/wrapper_bottom.c
View File

@ -21,11 +21,8 @@ MOD_INIT(_lasso)
{
PyObject *m, *d;
#if PY_MAJOR_VERSION <= 2
/// @todo Seg-faults on Python 3...
if (PyType_Ready(&PyGObjectPtrType) < 0)
return MOD_ERROR_VAL;
#endif
MOD_DEF(m, "_lasso", "_lasso wrapper module", lasso_methods);
d = PyModule_GetDict(m);
@ -33,11 +30,8 @@ MOD_INIT(_lasso)
lasso_wrapper_key = g_quark_from_static_string("PyLasso::wrapper");
#if PY_MAJOR_VERSION <= 2
/// @todo Seg-faults on Python 3...
Py_INCREF(&PyGObjectPtrType);
PyModule_AddObject(m, "PyGObjectPtr", (PyObject *)&PyGObjectPtrType);
#endif
lasso_init();
lasso_log_set_handler(G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION | G_LOG_LEVEL_MASK,
lasso_python_log, NULL);

3
bindings/python/wrapper_top.c
View File

@ -575,8 +575,7 @@ static PyGetSetDef PyGObjectPtr_getseters[] = {
static PyTypeObject PyGObjectPtrType = {
PyVarObject_HEAD_INIT(NULL, 0)
0, /* ob_size */
PyVarObject_HEAD_INIT(NULL, 0 /* ob_size */)
"_lasso.PyGObjectPtr", /* tp_name */
sizeof(PyGObjectPtr), /* tp_basicsize */
0, /* tp_itemsize */