refactor uname to use the same code paths as sys module

Author: timfel

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

@@ -1409,7 +1409,7 @@ abstract static class UnameNode extends PythonBuiltinNode {
         @Specialization
         @TruffleBoundary(allowInlining = true)
         PTuple uname() {
-            String sysname = System.getProperty("os.name", "");
+            String sysname = SysModuleBuiltins.getPythonOSName();
             String nodename = "";
             try {
                 InetAddress addr;
@@ -1419,11 +1419,7 @@ PTuple uname() {
             }
             String release = System.getProperty("os.version", "");
             String version = "";
-            String machine = System.getProperty("os.arch", "");
-            if (machine.equals("amd64")) {
-                // be compatible with CPython's designation
-                machine = "x86_64";
-            }
+            String machine = SysModuleBuiltins.getPythonArch();
             return factory().createTuple(new Object[]{sysname, nodename, release, version, machine});
         }
     }

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

@@ -175,6 +175,23 @@ public void initialize(PythonCore core) {
                         1                       // FLT_ROUNDS
         }));
 
+        String os = getPythonOSName();
+        builtinConstants.put("platform", os);
+        builtinConstants.put("__gmultiarch", getPythonArch() + "-" + os);
+
+        super.initialize(core);
+    }
+
+    static String getPythonArch() {
+        String arch = System.getProperty("os.arch", "");
+        if (arch.equals("amd64")) {
+            // be compatible with CPython's designation
+            arch = "x86_64";
+        }
+        return arch;
+    }
+
+    static String getPythonOSName() {
         String property = System.getProperty("os.name");
         String os = "java";
         if (property.toLowerCase().contains("cygwin")) {
@@ -190,12 +207,7 @@ public void initialize(PythonCore core) {
         } else if (property.toLowerCase().contains("freebsd")) {
             os = "freebsd";
         }
-        builtinConstants.put("platform", os);
-
-        String architecture = System.getProperty("os.arch");
-        builtinConstants.put("__gmultiarch", architecture + "-" + os);
-
-        super.initialize(core);
+        return os;
     }
 
     @Builtin(name = "exc_info", fixedNumOfPositionalArgs = 0)