Make sys.flag proper named tuple and fix the types of the components

Author: steve-s

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys.txt

@@ -34,3 +34,4 @@
 *graalpython.lib-python.3.test.test_sys.UnraisableHookTest.test_original_unraisablehook
 *graalpython.lib-python.3.test.test_sys.UnraisableHookTest.test_original_unraisablehook_err
 *graalpython.lib-python.3.test.test_sys.UnraisableHookTest.test_original_unraisablehook_wrong_type
+*graalpython.lib-python.3.test.test_sys.SysModuleTest.test_sys_flags

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

@@ -61,6 +61,7 @@
 import com.oracle.graal.python.builtins.objects.function.PFunction;
 import com.oracle.graal.python.builtins.objects.function.Signature;
 import com.oracle.graal.python.builtins.objects.generator.PGenerator;
+import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.method.PMethod;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
@@ -172,19 +173,19 @@ public void postInitialize(PythonCore core) {
         mod.setAttribute("capi_home", capiHome);
         mod.setAttribute("platform_id", toolchain.getIdentifier());
         mod.setAttribute("flags", core.factory().createTuple(new Object[]{
-                        false, // bytes_warning
-                        !context.getOption(PythonOptions.PythonOptimizeFlag), // debug
-                        context.getOption(PythonOptions.DontWriteBytecodeFlag),  // dont_write_bytecode
-                        false, // hash_randomization
-                        context.getOption(PythonOptions.IgnoreEnvironmentFlag), // ignore_environment
-                        context.getOption(PythonOptions.InspectFlag), // inspect
-                        context.getOption(PythonOptions.TerminalIsInteractive), // interactive
-                        context.getOption(PythonOptions.IsolateFlag), // isolated
-                        context.getOption(PythonOptions.NoSiteFlag), // no_site
-                        context.getOption(PythonOptions.NoUserSiteFlag), // no_user_site
-                        context.getOption(PythonOptions.PythonOptimizeFlag), // optimize
-                        context.getOption(PythonOptions.QuietFlag), // quiet
-                        context.getOption(PythonOptions.VerboseFlag), // verbose
+                        0, // bytes_warning
+                        PInt.intValue(!context.getOption(PythonOptions.PythonOptimizeFlag)), // debug
+                        PInt.intValue(context.getOption(PythonOptions.DontWriteBytecodeFlag)),  // dont_write_bytecode
+                        0, // hash_randomization
+                        PInt.intValue(context.getOption(PythonOptions.IgnoreEnvironmentFlag)), // ignore_environment
+                        PInt.intValue(context.getOption(PythonOptions.InspectFlag)), // inspect
+                        PInt.intValue(context.getOption(PythonOptions.TerminalIsInteractive)), // interactive
+                        PInt.intValue(context.getOption(PythonOptions.IsolateFlag)), // isolated
+                        PInt.intValue(context.getOption(PythonOptions.NoSiteFlag)), // no_site
+                        PInt.intValue(context.getOption(PythonOptions.NoUserSiteFlag)), // no_user_site
+                        PInt.intValue(context.getOption(PythonOptions.PythonOptimizeFlag)), // optimize
+                        PInt.intValue(context.getOption(PythonOptions.QuietFlag)), // quiet
+                        PInt.intValue(context.getOption(PythonOptions.VerboseFlag)), // verbose
                         false, // dev_mode
                         0, // utf8_mode
         }));

graalpython/lib-graalpython/sys.py

@@ -63,27 +63,12 @@ def make_implementation_info():
 
 def make_flags_class():
     from _descriptor import make_named_tuple_class
-    get_set_descriptor = type(type(make_flags_class).__code__)
-
     names = ["bytes_warning", "debug", "dont_write_bytecode",
              "hash_randomization", "ignore_environment", "inspect",
              "interactive", "isolated", "no_site", "no_user_site", "optimize",
              "quiet", "verbose", "dev_mode", "utf8_mode"]
-
-    flags_class = make_named_tuple_class("sys.flags", names)
-
-    def make_func(i):
-        def func(self):
-            return __graalpython__.flags[i]
-        return func
-
-    for i, f in enumerate(names):
-        setattr(flags_class, f, get_set_descriptor(fget=make_func(i), name=f, owner=flags_class))
-
-    return flags_class
-
-
-flags = make_flags_class()()
+    return make_named_tuple_class("sys.flags", names)
+flags = make_flags_class()(__graalpython__.flags)
 del make_flags_class