Import error reporting during native module initialization.

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java

@@ -174,16 +174,7 @@ private Object loadDynamicModuleWithSpec(String name, String path, Node readNode
             } catch (SecurityException | IOException e) {
                 throw raise(ImportError, "cannot load %s: %s", path, e.getMessage());
             } catch (RuntimeException e) {
-                StringBuilder sb = new StringBuilder();
-                sb.append(e.getMessage());
-                Throwable cause = e;
-                while ((cause = cause.getCause()) != null) {
-                    if (cause.getMessage() != null) {
-                        sb.append(", ");
-                        sb.append(cause.getMessage());
-                    }
-                }
-                throw raise(ImportError, "cannot load %s: %s", path, sb.toString());
+                throw reportImportError(e, path);
             }
             TruffleObject pyinitFunc;
             try {
@@ -207,6 +198,8 @@ private Object loadDynamicModuleWithSpec(String name, String path, Node readNode
             } catch (UnsupportedTypeException | ArityException | UnsupportedMessageException e) {
                 e.printStackTrace();
                 throw raise(ImportError, "cannot initialize %s with PyInit_%s", path, basename);
+            } catch (RuntimeException e) {
+                throw reportImportError(e, path);
             }
         }
 
@@ -238,6 +231,19 @@ private SetItemNode getSetItemNode() {
             return setItemNode;
         }
 
+        private PException reportImportError(RuntimeException e, String path) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(e.getMessage());
+            Throwable cause = e;
+            while ((cause = cause.getCause()) != null) {
+                if (cause.getMessage() != null) {
+                    sb.append(", ");
+                    sb.append(cause.getMessage());
+                }
+            }
+            return raise(ImportError, "cannot load %s: %s", path, sb.toString());
+        }
+
     }
 
     @Builtin(name = "exec_dynamic", fixedNumOfArguments = 1)