fix style issues

Author: timfel

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/advance/ResourcesTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -48,18 +48,12 @@
 public class ResourcesTest {
     @Test
     public void testResourcesAsHome() {
-        try (Context context = Context.newBuilder("python").
-                        allowExperimentalOptions(true).
-                        option("python.PythonHome", "/path/that/does/not/exist").
-                        build()) {
+        try (Context context = Context.newBuilder("python").allowExperimentalOptions(true).option("python.PythonHome", "/path/that/does/not/exist").build()) {
             String foundHome = context.eval("python", "__graalpython__.home").asString();
             assertTrue(foundHome, foundHome.contains("python/python-home"));
         }
 
-        try (Context context = Context.newBuilder("python").
-                        allowExperimentalOptions(true).
-                        option("python.PythonHome", "").
-                        build()) {
+        try (Context context = Context.newBuilder("python").allowExperimentalOptions(true).option("python.PythonHome", "").build()) {
             String foundHome = context.eval("python", "__graalpython__.home").asString();
             assertTrue(foundHome, !foundHome.contains("graalpython"));
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -216,20 +216,21 @@ private static Class<PythonResource> getPythonResourceClass() {
 
         PYTHON_RESOURCE_CLASS = getPythonResourceClass();
         try (InputStream is = PythonLanguage.class.getResourceAsStream("/graalpy_versions")) {
-            if (MAJOR != is.read()) {
-                throw new RuntimeException("suite.py version info does not match PythonLanguage#MAJOR");
+            int ch;
+            if (MAJOR != (ch = is.read())) {
+                throw new RuntimeException("suite.py version info does not match PythonLanguage#MAJOR: " + ch);
             }
-            if (MINOR != is.read()) {
-                throw new RuntimeException("suite.py version info does not match PythonLanguage#MINOR");
+            if (MINOR != (ch = is.read())) {
+                throw new RuntimeException("suite.py version info does not match PythonLanguage#MINOR: " + ch);
             }
-            if (MICRO != is.read()) {
-                throw new RuntimeException("suite.py version info does not match PythonLanguage#MICRO");
+            if (MICRO != (ch = is.read())) {
+                throw new RuntimeException("suite.py version info does not match PythonLanguage#MICRO: " + ch);
             }
-            if (GRAALVM_MAJOR != is.read()) {
-                throw new RuntimeException("suite.py version info does not match PythonLanguage#GRAALVM_MAJOR");
+            if (GRAALVM_MAJOR != (ch = is.read())) {
+                throw new RuntimeException("suite.py version info does not match PythonLanguage#GRAALVM_MAJOR: " + ch);
             }
-            if (GRAALVM_MINOR != is.read()) {
-                throw new RuntimeException("suite.py version info does not match PythonLanguage#GRAALVM_MINOR");
+            if (GRAALVM_MINOR != (ch = is.read())) {
+                throw new RuntimeException("suite.py version info does not match PythonLanguage#GRAALVM_MINOR: " + ch);
             }
         } catch (IOException e) {
             throw new RuntimeException(e);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/lzma/LZMAObject.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -1721,18 +1721,20 @@ public void initializeHomeAndPrefixPaths(Env newEnv, String languageHome) {
             home = null;
         }
 
-        Supplier<?>[] homeCandidates = new Supplier<?>[] {
-            () -> { return home; },
-            () -> {
-                if (PythonLanguage.PYTHON_RESOURCE_CLASS != null) {
-                    try {
-                        return newEnv.getInternalResource(PythonLanguage.PYTHON_RESOURCE_CLASS).getAbsoluteFile();
-                    } catch (IOException e) {
-                        // fall through
-                    }
-                }
-                return null;
-            }
+        Supplier<?>[] homeCandidates = new Supplier<?>[]{
+                        () -> {
+                            return home;
+                        },
+                        () -> {
+                            if (PythonLanguage.PYTHON_RESOURCE_CLASS != null) {
+                                try {
+                                    return newEnv.getInternalResource(PythonLanguage.PYTHON_RESOURCE_CLASS).getAbsoluteFile();
+                                } catch (IOException e) {
+                                    // fall through
+                                }
+                            }
+                            return null;
+                        }
         };
         for (Supplier<?> homeCandidateSupplier : homeCandidates) {
             final TruffleFile homeCandidate = (TruffleFile) homeCandidateSupplier.get();
@@ -1832,6 +1834,7 @@ public void initializeHomeAndPrefixPaths(Env newEnv, String languageHome) {
             if (sysPrefix.isEmpty()) {
                 sysPrefix = T_DOT;
             }
+            langHome = toTruffleStringUncached(base.relativize(newEnv.getInternalTruffleFile(langHome.toJavaStringUncached())).getPath());
             coreHome = toTruffleStringUncached(base.relativize(newEnv.getInternalTruffleFile(coreHome.toJavaStringUncached())).getPath());
             stdLibHome = toTruffleStringUncached(base.relativize(newEnv.getInternalTruffleFile(stdLibHome.toJavaStringUncached())).getPath());
             capiHome = toTruffleStringUncached(base.relativize(newEnv.getInternalTruffleFile(capiHome.toJavaStringUncached())).getPath());