lin-epics-modules/pyDevSup
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

proper module init

Browse Source
This commit is contained in:
Michael Davidsaver
2013-04-14 12:57:35 -04:00
parent 47c47dfa6e
commit ec3e8e4519
4 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
devsupApp/src/dbfield.c
View File

@@ -292,10 +292,12 @@ static PyTypeObject pyField_type = {
sizeof(pyField),
};
int pyField_prepare(void)
int pyField_prepare(PyObject *module)
{
size_t i;
import_array1(-1);
pyField_type.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE;
#if PY_MAJOR_VERSION < 3
pyField_type.tp_flags |= Py_TPFLAGS_HAVE_GETCHARBUFFER|Py_TPFLAGS_HAVE_NEWBUFFER;
@@ -308,7 +310,12 @@ int pyField_prepare(void)
if(PyType_Ready(&pyField_type)<0)
return -1;
import_array1(-1);
PyObject *typeobj=(PyObject*)&pyField_type;
Py_INCREF(typeobj);
if(PyModule_AddObject(module, "_Field", typeobj)) {
Py_DECREF(typeobj);
return -1;
}
#ifdef HAVE_NUMPY
for(i=0; i<=DBF_MENU; i++) {
@@ -320,13 +327,6 @@ int pyField_prepare(void)
return 0;
}
void pyField_setup(PyObject *module)
{
PyObject *typeobj=(PyObject*)&pyField_type;
Py_INCREF(typeobj);
PyModule_AddObject(module, "_Field", (PyObject*)&pyField_type);
}
void pyField_cleanup(void)
{
size_t i;