summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-08-25 20:52:39 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-08-25 20:52:39 +0000
commit3458c5050ba43b6d4450fbbd0319aa0ba2d06d01 (patch)
tree7a047bde7d4a4743aea1b70d32bc053e43a27ccf
parent7dd9a565c2fc24b49b1bb0193a9e826294c1f876 (diff)
downloadnumpy-3458c5050ba43b6d4450fbbd0319aa0ba2d06d01.tar.gz
Revert import_array so that it doesn't return anything
-rw-r--r--numpy/core/code_generators/generate_array_api.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/numpy/core/code_generators/generate_array_api.py b/numpy/core/code_generators/generate_array_api.py
index 41c876963..35c68ebbd 100644
--- a/numpy/core/code_generators/generate_array_api.py
+++ b/numpy/core/code_generators/generate_array_api.py
@@ -89,7 +89,13 @@ _import_array(void)
return 0;
}
-#define import_array() { if (_import_array() < 0) {PyErr_Print(); PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import"); return; } }
+#define import_array() { if (_import_array() < 0) {PyErr_Print(); PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import"); } }
+
+#define import_array0() {if (_import_array() < 0) {PyErr_Print(); PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import"); return ; } }
+
+#define import_array1(ret) {if (_import_array() < 0) {PyErr_Print(); PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import"); return ret; } }
+
+#define import_array2(msg, ret) {if (_import_array() < 0) {PyErr_Print(); PyErr_SetString(PyExc_ImportError, msg); return ret; } }
#endif