Commit 06d328b1 authored by Manuel Günther's avatar Manuel Günther

Corrected error cases in module creation

parent 7ec54f93
......@@ -137,11 +137,13 @@ static PyObject* create_module (void) {
# if PY_VERSION_HEX >= 0x03000000
PyObject* module = PyModule_Create(&module_definition);
auto module_ = make_xsafe(module);
const char* ret = "O";
# else
PyObject* module = Py_InitModule3(BOB_EXT_MODULE_NAME, module_methods, module_docstr);
const char* ret = "N";
# endif
if (!module) return 0;
auto module_ = make_safe(module); ///< protects against early returns
if (PyModule_AddStringConstant(module, "__version__", BOB_EXT_MODULE_VERSION) < 0) return 0;
if (!init_BobIpBaseGeomNorm(module)) return 0;
......@@ -208,8 +210,7 @@ static PyObject* create_module (void) {
if (import_bob_io_base() < 0) return 0;
if (import_bob_sp() < 0) return 0;
return Py_BuildValue("O", module);
return Py_BuildValue(ret, module);
}
PyMODINIT_FUNC BOB_EXT_ENTRY_NAME (void) {
......
......@@ -60,25 +60,27 @@ static PyModuleDef module_definition = {
static PyObject* create_module (void) {
# if PY_VERSION_HEX >= 0x03000000
PyObject* m = PyModule_Create(&module_definition);
PyObject* module = PyModule_Create(&module_definition);
auto module_ = make_xsafe(module);
const char* ret = "O";
# else
PyObject* m = Py_InitModule3(BOB_EXT_MODULE_NAME, module_methods, module_docstr);
PyObject* module = Py_InitModule3(BOB_EXT_MODULE_NAME, module_methods, module_docstr);
const char* ret = "N";
# endif
if (!m) return 0;
auto m_ = make_safe(m); ///< protects against early returns
if (!module) return 0;
/* register version numbers and constants */
if (PyModule_AddIntConstant(m, "api", BOB_IP_BASE_API_VERSION) < 0) return 0;
if (PyModule_AddStringConstant(m, "module", BOB_EXT_MODULE_VERSION) < 0) return 0;
if (PyModule_AddIntConstant(module, "api", BOB_IP_BASE_API_VERSION) < 0) return 0;
if (PyModule_AddStringConstant(module, "module", BOB_EXT_MODULE_VERSION) < 0) return 0;
PyObject* externals = build_version_dictionary();
if (!externals) return 0;
if (PyModule_AddObject(m, "externals", externals) < 0) return 0;
if (PyModule_AddObject(module, "externals", externals) < 0) return 0;
// call version to avoid compiler warning
auto _ = make_safe(bob_ip_base_version());
return Py_BuildValue("O", m);
return Py_BuildValue(ret, module);
}
PyMODINIT_FUNC BOB_EXT_ENTRY_NAME (void) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment