Commit 05567d53 authored by Manuel Günther's avatar Manuel Günther

Based get_config on bob.extension

parent b19cff08
...@@ -13,22 +13,8 @@ from .version import api as __api_version__ ...@@ -13,22 +13,8 @@ from .version import api as __api_version__
def get_config(): def get_config():
"""Returns a string containing the configuration information. """Returns a string containing the configuration information.
""" """
return bob.extension.get_config(__name__, version.externals, version.api)
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()
# gets sphinx autodoc done right - don't remove it # gets sphinx autodoc done right - don't remove it
__all__ = [_ for _ in dir() if not _.startswith('_')] __all__ = [_ for _ in dir() if not _.startswith('_')]
...@@ -53,10 +53,6 @@ static PyObject* create_module (void) { ...@@ -53,10 +53,6 @@ static PyObject* create_module (void) {
if (!m) return 0; if (!m) return 0;
auto m_ = make_safe(m); auto m_ = make_safe(m);
/* register some constants */
if (PyModule_AddIntConstant(m, "__api_version__", BOB_LEARN_LIBSVM_API_VERSION) < 0) return 0;
if (PyModule_AddStringConstant(m, "__version__", BOB_EXT_MODULE_VERSION) < 0) return 0;
/* register the types to python */ /* register the types to python */
Py_INCREF(&PyBobLearnLibsvmFile_Type); Py_INCREF(&PyBobLearnLibsvmFile_Type);
if (PyModule_AddObject(m, "File", (PyObject *)&PyBobLearnLibsvmFile_Type) < 0) return 0; if (PyModule_AddObject(m, "File", (PyObject *)&PyBobLearnLibsvmFile_Type) < 0) return 0;
...@@ -147,9 +143,7 @@ static PyObject* create_module (void) { ...@@ -147,9 +143,7 @@ static PyObject* create_module (void) {
return 0; return 0;
} }
Py_INCREF(m); return Py_BuildValue("O", m);
return m;
} }
PyMODINIT_FUNC BOB_EXT_ENTRY_NAME (void) { PyMODINIT_FUNC BOB_EXT_ENTRY_NAME (void) {
......
...@@ -171,10 +171,8 @@ static PyObject* create_module (void) { ...@@ -171,10 +171,8 @@ static PyObject* create_module (void) {
auto m_ = make_safe(m); ///< protects against early returns auto m_ = make_safe(m); ///< protects against early returns
/* register version numbers and constants */ /* register version numbers and constants */
if (PyModule_AddIntConstant(m, "api", BOB_LEARN_LIBSVM_API_VERSION) < 0) if (PyModule_AddIntConstant(m, "api", BOB_LEARN_LIBSVM_API_VERSION) < 0) return 0;
return 0; 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(); PyObject* externals = build_version_dictionary();
if (!externals) return 0; if (!externals) return 0;
...@@ -187,8 +185,7 @@ static PyObject* create_module (void) { ...@@ -187,8 +185,7 @@ static PyObject* create_module (void) {
return 0; return 0;
} }
Py_INCREF(m); return Py_BuildValue("O", m);
return m;
} }
......
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