tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

python module mac compilation

Browse Source
This commit is contained in:
Jean-Francois Dockes 2013-01-05 08:49:24 +01:00
parent 5f61c2edff
commit 90bd9d466d
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/python/recoll/pyrclextract.cpp
View File

@ -291,5 +291,17 @@ initrclextract(void)
Py_INCREF(&rclx_ExtractorType); Py_INCREF(&rclx_ExtractorType);
PyModule_AddObject(m, "Extractor", (PyObject *)&rclx_ExtractorType); PyModule_AddObject(m, "Extractor", (PyObject *)&rclx_ExtractorType);
#if PY_MAJOR_VERSION >= 2 && PY_MINOR_VERSION >= 7
recoll_DocType = (PyObject*)PyCapsule_Import(PYRECOLL_PACKAGE "recoll.doctypeptr", 0); recoll_DocType = (PyObject*)PyCapsule_Import(PYRECOLL_PACKAGE "recoll.doctypeptr", 0);
#else
PyObject *module = PyImport_ImportModule(PYRECOLL_PACKAGE "recoll");
if (module != NULL) {
PyObject *cobject = PyObject_GetAttrString(module, "_C_API");
if (cobject == NULL)
return;
if (PyCObject_Check(cobject))
recoll_DocType = (PyObject*)PyCObject_AsVoidPtr(cobject);
Py_DECREF(cobject);
}
#endif
} }

10
src/python/recoll/pyrecoll.cpp
View File

@ -1857,8 +1857,14 @@ initrecoll(void)
PyModule_AddStringConstant(m, "__doc__", PyModule_AddStringConstant(m, "__doc__",
pyrecoll_doc_string); pyrecoll_doc_string);
PyObject *doctypecobject;
#if PY_MAJOR_VERSION >= 2 && PY_MINOR_VERSION >= 7
// Export a few pointers for the benefit of other recoll python modules // Export a few pointers for the benefit of other recoll python modules
PyObject* doctypecapsule = doctypecobject=
PyCapsule_New(&recoll_DocType, PYRECOLL_PACKAGE "recoll.doctypeptr", 0); PyCapsule_New(&recoll_DocType, PYRECOLL_PACKAGE "recoll.doctypeptr", 0);
PyModule_AddObject(m, "doctypeptr", doctypecapsule); #else
doctypecobject = PyCObject_FromVoidPtr(&recoll_DocType, NULL);
#endif
PyModule_AddObject(m, "doctypeptr", doctypecobject);
} }