F2PY G3: exposing f90 type information via _API variable for other modules.

1 files changed, 8 insertions, 2 deletions

diff --git a/numpy/f2py/lib/py_wrap.py b/numpy/f2py/lib/py_wrap.py
index e4dc82786..b35e4452c 100644
--- a/numpy/f2py/lib/py_wrap.py
+++ b/numpy/f2py/lib/py_wrap.py
@@ -43,11 +43,17 @@ static PyMethodDef f2py_module_methods[] = {
 PyMODINIT_FUNC init%(modulename)s(void) {
   f2py_module = Py_InitModule("%(modulename)s", f2py_module_methods);
   import_array();
-  %(module_init_list)s
   if (PyErr_Occurred()) {
-    PyErr_SetString(PyExc_ImportError, "can\'t initialize module %(modulename)s");
+    PyErr_SetString(PyExc_ImportError, "failed to load array module.");
     return;
   }
+  %(module_init_list)s
+  return;
+capi_err:
+  if (!PyErr_Occurred()) {
+    PyErr_SetString(PyExc_RuntimeError, "failed to initialize %(modulename)s module.");
+  }
+  return;
 }
 #ifdef __cplusplus
 }