From 6e00d9cdcd99fb96836f34dfde6b396c01a97cf4 Mon Sep 17 00:00:00 2001 From: Manuel Guenther Date: Wed, 20 May 2015 15:28:52 +0200 Subject: [PATCH] Removed duplicated constants from c module --- bob/measure/main.cpp | 7 +------ bob/measure/version.cpp | 7 ++----- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/bob/measure/main.cpp b/bob/measure/main.cpp index c72dbd1..b795fd8 100644 --- a/bob/measure/main.cpp +++ b/bob/measure/main.cpp @@ -1095,15 +1095,10 @@ static PyObject* create_module (void) { if (!m) return 0; auto m_ = make_safe(m); ///< protects against early returns - if (PyModule_AddStringConstant(m, "__version__", BOB_EXT_MODULE_VERSION) < 0) - return 0; - /* imports bob.blitz C-API + dependencies */ if (import_bob_blitz() < 0) return 0; - Py_INCREF(m); - return m; - + return Py_BuildValue("O", m); } PyMODINIT_FUNC BOB_EXT_ENTRY_NAME (void) { diff --git a/bob/measure/version.cpp b/bob/measure/version.cpp index d07d00c..e355d5f 100644 --- a/bob/measure/version.cpp +++ b/bob/measure/version.cpp @@ -158,8 +158,7 @@ static PyObject* create_module (void) { auto m_ = make_safe(m); ///< protects against early returns /* register version numbers and constants */ - if (PyModule_AddStringConstant(m, "module", BOB_EXT_MODULE_VERSION) < 0) - return 0; + if (PyModule_AddStringConstant(m, "module", BOB_EXT_MODULE_VERSION) < 0) return 0; PyObject* externals = build_version_dictionary(); if (!externals) return 0; @@ -167,9 +166,7 @@ static PyObject* create_module (void) { if (import_bob_blitz() < 0) return 0; - Py_INCREF(m); - return m; - + return Py_BuildValue("O", m); } PyMODINIT_FUNC BOB_EXT_ENTRY_NAME (void) {