shaba/libvirt-python
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt-python.git synced 2025-07-28 15:41:52 +03:00
Code Issues Projects Releases Activity

Revert "Optimize callback lookup in event handlers"

Browse Source 
This reverts commit 084729e269.

The PyImport_ImportModuleNoBlock method does not exist in
python 2.4

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange
2013-12-04 18:04:49 +00:00
parent dcbbb23072
commit 7e68c27960
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
libvirt-override.c
View File

@ -4921,26 +4921,39 @@ cleanup:
* Helper functions to avoid importing modules * Helper functions to avoid importing modules
* for every callback * for every callback
*******************************************/ *******************************************/
static PyObject *libvirt_module = NULL;
static PyObject *libvirt_dict = NULL;
static PyObject *
getLibvirtModuleObject(void) {
if (libvirt_module)
return libvirt_module;
// PyImport_ImportModule returns a new reference
/* Bogus (char *) cast for RHEL-5 python API brokenness */
libvirt_module = PyImport_ImportModule((char *)"libvirt");
if (!libvirt_module) {
DEBUG("%s Error importing libvirt module\n", __FUNCTION__);
PyErr_Print();
return NULL;
}
return libvirt_module;
}
static PyObject * static PyObject *
getLibvirtDictObject(void) { getLibvirtDictObject(void) {
PyObject *libvirt_mod; if (libvirt_dict)
PyObject *libvirt_dict; return libvirt_dict;
libvirt_mod = PyImport_ImportModuleNoBlock("libvirt"); // PyModule_GetDict returns a borrowed reference
if (!libvirt_mod) { libvirt_dict = PyModule_GetDict(getLibvirtModuleObject());
DEBUG("%s Error finding libvirt in imports\n",
__FUNCTION__);
PyErr_Print();
return NULL;
}
libvirt_dict = PyModule_GetDict(libvirt_mod);
if (!libvirt_dict) { if (!libvirt_dict) {
DEBUG("%s Error finding libvirt dict\n", DEBUG("%s Error importing libvirt dictionary\n", __FUNCTION__);
__FUNCTION__);
PyErr_Print(); PyErr_Print();
return NULL; return NULL;
} }
Py_INCREF(libvirt_dict); Py_INCREF(libvirt_dict);
return libvirt_dict; return libvirt_dict;
} }