From de5ef16098f86e697d87a475b5f89b4337cf4d94 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Wed, 14 May 2014 15:23:10 +0200
Subject: [PATCH] Careful C-API importing
---
xbob/io/base/main.cpp | 8 ++++++--
xbob/io/base/version.cpp | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/xbob/io/base/main.cpp b/xbob/io/base/main.cpp
index 0d2c460..b00c088 100644
--- a/xbob/io/base/main.cpp
+++ b/xbob/io/base/main.cpp
@@ -167,8 +167,12 @@ static PyObject* create_module (void) {
if (PyModule_AddObject(m, "_C_API", c_api_object) < 0) return 0;
- /* imports xbob.blitz C-API + dependencies */
- if (import_xbob_blitz() < 0) return 0;
+ /* imports dependencies */
+ if (import_xbob_blitz() < 0) {
+ PyErr_Print();
+ PyErr_Format(PyExc_ImportError, "cannot import `%s'", XBOB_EXT_MODULE_NAME);
+ return 0;
+ }
Py_INCREF(m);
return m;
diff --git a/xbob/io/base/version.cpp b/xbob/io/base/version.cpp
index 977d8a6..7602399 100644
--- a/xbob/io/base/version.cpp
+++ b/xbob/io/base/version.cpp
@@ -938,8 +938,12 @@ static PyObject* create_module (void) {
return 0;
if (PyModule_AddObject(m, "externals", build_version_dictionary()) < 0) return 0;
- /* imports xbob.blitz C-API + dependencies */
- if (import_xbob_blitz() < 0) return 0;
+ /* imports dependencies */
+ if (import_xbob_blitz() < 0) {
+ PyErr_Print();
+ PyErr_Format(PyExc_ImportError, "cannot import `%s'", XBOB_EXT_MODULE_NAME);
+ return 0;
+ }
Py_INCREF(m);
return m;
--
GitLab