From 4301d8b753042445bc26ffe413b58c2fb7d5da5b Mon Sep 17 00:00:00 2001
From: Manuel Guenther <manuel.guenther@idiap.ch>
Date: Wed, 20 May 2015 14:21:25 +0200
Subject: [PATCH] Based get_config on bob.extension
---
bob/learn/activation/__init__.py | 17 +----------------
bob/learn/activation/main.cpp | 8 +-------
bob/learn/activation/version.cpp | 10 +++-------
3 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/bob/learn/activation/__init__.py b/bob/learn/activation/__init__.py
index 563da23..7608c4f 100644
--- a/bob/learn/activation/__init__.py
+++ b/bob/learn/activation/__init__.py
@@ -13,22 +13,7 @@ from .version import api as __api_version__
def get_config():
"""Returns a string containing the configuration information.
"""
-
- import pkg_resources
- from .version import externals
-
- packages = pkg_resources.require(__name__)
- this = packages[0]
- deps = packages[1:]
-
- retval = "%s: %s [api=0x%04x] (%s)\n" % (this.key, this.version,
- version.api, this.location)
- retval += " - c/c++ dependencies:\n"
- for k in sorted(externals): retval += " - %s: %s\n" % (k, externals[k])
- retval += " - python dependencies:\n"
- for d in deps: retval += " - %s: %s (%s)\n" % (d.key, d.version, d.location)
-
- return retval.strip()
+ return bob.extension.get_config(__name__, version.externals, version.api)
# gets sphinx autodoc done right - don't remove it
__all__ = [_ for _ in dir() if not _.startswith('_')]
diff --git a/bob/learn/activation/main.cpp b/bob/learn/activation/main.cpp
index a5a5a8b..3e13250 100644
--- a/bob/learn/activation/main.cpp
+++ b/bob/learn/activation/main.cpp
@@ -65,10 +65,6 @@ static PyObject* create_module (void) {
if (!m) return 0;
auto m_ = make_safe(m);
- /* register some constants */
- if (PyModule_AddIntConstant(m, "__api_version__", BOB_LEARN_ACTIVATION_API_VERSION) < 0) return 0;
- if (PyModule_AddStringConstant(m, "__version__", BOB_EXT_MODULE_VERSION) < 0) return 0;
-
/* register the types to python */
Py_INCREF(&PyBobLearnActivation_Type);
if (PyModule_AddObject(m, "Activation", (PyObject *)&PyBobLearnActivation_Type) < 0) return 0;
@@ -166,9 +162,7 @@ static PyObject* create_module (void) {
return 0;
}
- Py_INCREF(m);
- return m;
-
+ return Py_BuildValue("O",m);
}
PyMODINIT_FUNC BOB_EXT_ENTRY_NAME (void) {
diff --git a/bob/learn/activation/version.cpp b/bob/learn/activation/version.cpp
index 7f006b8..5f77574 100644
--- a/bob/learn/activation/version.cpp
+++ b/bob/learn/activation/version.cpp
@@ -158,10 +158,8 @@ static PyObject* create_module (void) {
auto m_ = make_safe(m); ///< protects against early returns
/* register version numbers and constants */
- if (PyModule_AddIntConstant(m, "api", BOB_LEARN_ACTIVATION_API_VERSION) < 0)
- return 0;
- if (PyModule_AddStringConstant(m, "module", BOB_EXT_MODULE_VERSION) < 0)
- return 0;
+ if (PyModule_AddIntConstant(m, "api", BOB_LEARN_ACTIVATION_API_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;
@@ -174,9 +172,7 @@ static PyObject* create_module (void) {
return 0;
}
- Py_INCREF(m);
- return m;
-
+ return Py_BuildValue("O", m);
}
PyMODINIT_FUNC BOB_EXT_ENTRY_NAME (void) {
--
GitLab