Move constant HPY_LOAD_ERROR to ErrorMessages.

Author: fangerer

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

@@ -318,9 +318,6 @@ private Object initCApiModule(TruffleObject sulongLibrary, String initFuncName,
             }
         }
 
-        private static final String CAPI_LOAD_ERROR = "Could not load C API from %s.\n";
-        private static final String HPY_LOAD_ERROR = "Could not load HPy C API from %s.\n";
-
         @TruffleBoundary
         private void ensureCapiWasLoaded() {
             PythonContext context = getContext();
@@ -387,7 +384,7 @@ private GraalHPyContext ensureHPyWasLoaded(PythonContext context) {
                     interopLibrary.invokeMember(hpyLibrary, "graal_hpy_init", new GraalHPyInitObject(context.getHPyContext()));
                 } catch (IOException | RuntimeException | InteropException e) {
                     logJavaException(e);
-                    throw raise(ImportError, wrapJavaException(e), HPY_LOAD_ERROR, capiFile.getAbsoluteFile().getPath());
+                    throw raise(ImportError, wrapJavaException(e), ErrorMessages.HPY_LOAD_ERROR, capiFile.getAbsoluteFile().getPath());
                 }
             }
             return context.getHPyContext();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java

@@ -523,5 +523,6 @@ public abstract class ErrorMessages {
     public static final String PRECISION_NOT_ALLOWED_FOR_INT = "Precision not allowed in integer format specifier";
     public static final String SIGN_NOT_ALLOWED_WITH_C_FOR_INT = "Sign not allowed with integer format specifier 'c'";
     public static final String CAPI_LOAD_ERROR = "Could not load C API from %s.";
-    public static final String NATIVE_ACCESS_NOT_ALLOWED = "Cannot run any C extensions because native access is not allowed.\n";
+    public static final String NATIVE_ACCESS_NOT_ALLOWED = "Cannot run any C extensions because native access is not allowed.";
+    public static final String HPY_LOAD_ERROR = "Could not load HPy C API from %s.";
 }