remove os.uname from windows, implement the apis used in platform.py instead

timfel · timfel · commit d63f42558c61 · 2024-05-27T14:43:25.000+02:00
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py b/graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py
@@ -182,7 +182,7 @@ class TestTaggedUnittests(unittest.TestCase):
             working_tests = [x for x in working_tests if x[0] in selection]
 
     this_os = sys.platform
-    this_machine = os.uname().machine
+    this_machine = os.uname().machine if hasattr(os, "uname") else ""
     for idx, working_test in enumerate(working_tests):
         if os.environ.get("CI", None) and any(
             (os is None or os in this_os)
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java
@@ -332,6 +332,7 @@ public enum PythonBuiltinClassType implements TruffleObject {
     PStructPasswd("struct_passwd", "pwd", Flags.PUBLIC_DERIVED_WODICT, TUPLE_M_FLAGS),
     PStructRusage("struct_rusage", "resource", Flags.PUBLIC_DERIVED_WODICT, TUPLE_M_FLAGS),
     PVersionInfo("version_info", "sys", Flags.PUBLIC_DERIVED_WODICT, TUPLE_M_FLAGS),
+    PWindowsVersion("getwindowsversion", "sys", Flags.PUBLIC_DERIVED_WODICT, TUPLE_M_FLAGS),
     PFlags("flags", "sys", Flags.PUBLIC_DERIVED_WODICT, TUPLE_M_FLAGS),
     PFloatInfo("float_info", "sys", Flags.PUBLIC_DERIVED_WODICT, TUPLE_M_FLAGS),
     PIntInfo("int_info", "sys", Flags.PUBLIC_DERIVED_WODICT, TUPLE_M_FLAGS),
@@ -810,6 +811,7 @@ public final Shape getInstanceShape(PythonLanguage lang) {
         PStatvfsResult.redefinedSlots = repr;
         PFloatInfo.redefinedSlots = reprAndNew;
         PVersionInfo.redefinedSlots = repr;
+        PWindowsVersion.redefinedSlots = repr;
         PFlags.redefinedSlots = repr;
         PTerminalSize.redefinedSlots = reprAndNew;
 
@@ -920,6 +922,7 @@ public final Shape getInstanceShape(PythonLanguage lang) {
         PStructPasswd.base = PTuple;
         PStructRusage.base = PTuple;
         PVersionInfo.base = PTuple;
+        PWindowsVersion.base = PTuple;
         PFlags.base = PTuple;
         PFloatInfo.base = PTuple;
         PIntInfo.base = PTuple;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java
@@ -645,7 +645,7 @@ public abstract static class GetLoadAvgNode extends PythonBuiltinNode {
 
         /*
          * Return average recent system load information.
-         * 
+         *
          * Return the number of processes in the system run queue averaged over the last 1, 5, and
          * 15 minutes as a tuple of three floats. Raises OSError if the load average was
          * unobtainable.
@@ -1517,7 +1517,8 @@ protected ArgumentClinicProvider getArgumentClinic() {
         }
     }
 
-    @Builtin(name = "uname", minNumOfPositionalArgs = 0)
+    @Builtin(name = "uname", minNumOfPositionalArgs = 0, os = PythonOS.PLATFORM_LINUX)
+    @Builtin(name = "uname", minNumOfPositionalArgs = 0, os = PythonOS.PLATFORM_DARWIN)
     @GenerateNodeFactory
     abstract static class UnameNode extends PythonBuiltinNode {
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java
@@ -302,6 +302,27 @@ public final class SysModuleBuiltins extends PythonBuiltins {
                                     "'alpha', 'beta', 'candidate', or 'final'", "Serial release number"},
                     false);
 
+    static final StructSequence.BuiltinTypeDescriptor WINDOWS_VER_DESC = new StructSequence.BuiltinTypeDescriptor(
+                    PythonBuiltinClassType.PWindowsVersion,
+                    // @formatter:off The formatter joins these lines making it less readable
+                    "sys.getwindowsversion\n" +
+                    "\n" +
+                    "Return info about the running version of Windows as a named tuple.",
+                    // @formatter:on
+                    5,
+                    new String[]{
+                                    "major", "minor", "build",
+                                    "platform", "service_pack",
+                                    "service_pack_major", "service_pack_minor",
+                                    "suite_mask", "product_type", "platform_version"},
+                    new String[]{
+                                    "Major version number", "Minor version number", "Build number",
+                                    "Operating system platform", "Latest Service Pack installed on the system",
+                                    "Service Pack major version number", "Service Pack minor version number",
+                                    "Bit mask identifying available product suites",
+                                    "System product type", "Diagnostic version number"},
+                    false);
+
     static final StructSequence.BuiltinTypeDescriptor FLAGS_DESC = new StructSequence.BuiltinTypeDescriptor(
                     PythonBuiltinClassType.PFlags,
                     // @formatter:off The formatter joins these lines making it less readable
@@ -499,6 +520,9 @@ protected static PSimpleNamespace makeImplementation(PythonObjectFactory factory
     @Override
     public void initialize(Python3Core core) {
         StructSequence.initType(core, VERSION_INFO_DESC);
+        if (PythonOS.getPythonOS() == PLATFORM_WIN32) {
+            StructSequence.initType(core, WINDOWS_VER_DESC);
+        }
         StructSequence.initType(core, FLAGS_DESC);
         StructSequence.initType(core, FLOAT_INFO_DESC);
         StructSequence.initType(core, INT_INFO_DESC);
@@ -2012,4 +2036,52 @@ protected ArgumentClinicProvider getArgumentClinic() {
             return SetDlopenFlagsClinicProviderGen.INSTANCE;
         }
     }
+
+    @Builtin(name = "getwindowsversion", minNumOfPositionalArgs = 0, os = PLATFORM_WIN32)
+    @GenerateNodeFactory
+    abstract static class Getwindowsversion extends PythonBuiltinNode {
+        static int[] CACHED_VERSION_INFO = null;
+        static int PLATFORM = 2;
+
+        @Specialization
+        PTuple getVersion(@Cached PythonObjectFactory factory) {
+            if (CACHED_VERSION_INFO == null) {
+                cacheVersion();
+            }
+            return factory.createStructSeq(WINDOWS_VER_DESC,
+                            CACHED_VERSION_INFO[0], CACHED_VERSION_INFO[1], CACHED_VERSION_INFO[2],
+                            PLATFORM, T_EMPTY_STRING, 0, 0, 0, 1,
+                            factory.createTuple(CACHED_VERSION_INFO));
+        }
+
+        @TruffleBoundary
+        static void cacheVersion() {
+            String[] winvers = System.getProperty("os.version", "10.0.20000").split("\\.");
+            int major = 0;
+            int minor = 0;
+            int build = 0;
+            if (winvers.length > 0) {
+                try {
+                    major = Integer.parseInt(winvers[0]);
+                } catch (NumberFormatException e) {
+                    // use default
+                }
+            }
+            if (winvers.length > 1) {
+                try {
+                    minor = Integer.parseInt(winvers[1]);
+                } catch (NumberFormatException e) {
+                    // use default
+                }
+            }
+            if (winvers.length > 2) {
+                try {
+                    build = Integer.parseInt(winvers[2]);
+                } catch (NumberFormatException e) {
+                    // use default
+                }
+            }
+            CACHED_VERSION_INFO = new int[]{major, minor, build};
+        }
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/WinregModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/WinregModuleBuiltins.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -86,7 +86,6 @@ public void initialize(Python3Core core) {
         // stubs to just have msvc9compiler import
         addBuiltinConstant("error", PNone.NONE);
         addBuiltinConstant("EnumValue", PNone.NONE);
-        addBuiltinConstant("OpenKeyEx", PNone.NONE);
     }
 
     @Builtin(name = "OpenKey", minNumOfPositionalArgs = 2, parameterNames = {"key", "sub_key", "reserved", "access"})
@@ -125,4 +124,16 @@ static Object enumKey(VirtualFrame frame, Object key, Object index,
             throw constructAndRaiseNode.get(inliningTarget).raiseOSError(frame, OSErrorEnum.ENOENT);
         }
     }
+
+    @Builtin(name = "OpenKeyEx", minNumOfPositionalArgs = 2, parameterNames = {"key", "index"})
+    @GenerateNodeFactory
+    public abstract static class OpenKeyExNode extends PythonBinaryBuiltinNode {
+        @SuppressWarnings("unused")
+        @Specialization
+        static Object enumKey(VirtualFrame frame, Object key, Object index,
+                        @Bind("this") Node inliningTarget,
+                        @Cached PConstructAndRaiseNode.Lazy constructAndRaiseNode) {
+            throw constructAndRaiseNode.get(inliningTarget).raiseOSError(frame, OSErrorEnum.ENOENT);
+        }
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java
@@ -2571,7 +2571,7 @@ private static int getBuiltinTypeItemsize(PythonBuiltinClassType cls) {
                         PIntInfo, PHashInfo, PThreadInfo, PUnraisableHookArgs, PIOBase, PFileIO, PBufferedIOBase,
                         PBufferedReader, PBufferedWriter, PBufferedRWPair, PBufferedRandom, PIncrementalNewlineDecoder,
                         PTextIOWrapper, CArgObject, CThunkObject, StgDict, Structure, Union, PyCPointer, PyCArray,
-                        PyCData, SimpleCData, PyCFuncPtr, CField, DictRemover, StructParam -> 8;
+                        PWindowsVersion, PyCData, SimpleCData, PyCFuncPtr, CField, DictRemover, StructParam -> 8;
                 case PythonClass -> 40;
                 default -> 0;
             };
diff --git a/graalpython/lib-python/3/subprocess.py b/graalpython/lib-python/3/subprocess.py
@@ -72,7 +72,9 @@
 except ModuleNotFoundError:
     _mswindows = False
 else:
-    _mswindows = True
+    # Truffle change
+    # _mswindows = True
+    _mswindows = False
 
 # wasm32-emscripten and wasm32-wasi do not support processes
 _can_fork_exec = sys.platform not in {"emscripten", "wasi"}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* The Universal Permissive License (UPL), Version 1.0`
`@@ -86,7 +86,6 @@ public void initialize(Python3Core core) {`
`86`	`86`	`// stubs to just have msvc9compiler import`
`87`	`87`	`addBuiltinConstant("error", PNone.NONE);`
`88`	`88`	`addBuiltinConstant("EnumValue", PNone.NONE);`
`89`		`- addBuiltinConstant("OpenKeyEx", PNone.NONE);`
`90`	`89`	`}`
`91`	`90`
`92`	`91`	`@Builtin(name = "OpenKey", minNumOfPositionalArgs = 2, parameterNames = {"key", "sub_key", "reserved", "access"})`
`@@ -125,4 +124,16 @@ static Object enumKey(VirtualFrame frame, Object key, Object index,`
`125`	`124`	`throw constructAndRaiseNode.get(inliningTarget).raiseOSError(frame, OSErrorEnum.ENOENT);`
`126`	`125`	`}`
`127`	`126`	`}`
	`127`	`+`
	`128`	`+ @Builtin(name = "OpenKeyEx", minNumOfPositionalArgs = 2, parameterNames = {"key", "index"})`
	`129`	`+ @GenerateNodeFactory`
	`130`	`+ public abstract static class OpenKeyExNode extends PythonBinaryBuiltinNode {`
	`131`	`+ @SuppressWarnings("unused")`
	`132`	`+ @Specialization`
	`133`	`+ static Object enumKey(VirtualFrame frame, Object key, Object index,`
	`134`	`+ @Bind("this") Node inliningTarget,`
	`135`	`+ @Cached PConstructAndRaiseNode.Lazy constructAndRaiseNode) {`
	`136`	`+ throw constructAndRaiseNode.get(inliningTarget).raiseOSError(frame, OSErrorEnum.ENOENT);`
	`137`	`+ }`
	`138`	`+ }`
`128`	`139`	`}`