shift binary graalpy version string into printable char range

Author: timfel

graalpython/com.oracle.graal.python.resources/src/com/oracle/graal/python/resources/PythonResource.java

@@ -64,11 +64,11 @@ public final class PythonResource implements InternalResource {
 
     static {
         try (InputStream is = PythonResource.class.getResourceAsStream("/graalpy_versions")) {
-            PYTHON_MAJOR = is.read();
-            PYTHON_MINOR = is.read();
+            PYTHON_MAJOR = is.read() - ' ';
+            PYTHON_MINOR = is.read() - ' ';
             is.read(); // skip python micro version
-            GRAALVM_MAJOR = is.read();
-            GRAALVM_MINOR = is.read();
+            GRAALVM_MAJOR = is.read() - ' ';
+            GRAALVM_MINOR = is.read() - ' ';
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

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

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

mx.graalpython/mx_graalpython.py

@@ -1748,7 +1748,7 @@ def py_version_short(variant=None, **kwargs):
     if variant == 'major_minor_nodot':
         return PYTHON_VERSION_MAJ_MIN.replace(".", "")
     elif variant == 'binary':
-        return "".join([chr(int(p)) for p in PYTHON_VERSION.split(".")])
+        return "".join([chr(int(p) + ord(' ')) for p in PYTHON_VERSION.split(".")])
     else:
         return PYTHON_VERSION_MAJ_MIN
 
@@ -1757,7 +1757,7 @@ def graal_version_short(variant=None, **kwargs):
     if variant == 'major_minor_nodot':
         return GRAAL_VERSION_MAJ_MIN.replace(".", "")
     elif variant == 'binary':
-        return "".join([chr(int(p)) for p in GRAAL_VERSION.split(".")])
+        return "".join([chr(int(p) + ord(' ')) for p in GRAAL_VERSION.split(".")])
     else:
         return GRAAL_VERSION_MAJ_MIN