move sys.__graalpython_flags__ to __graalpython__.flags

Author: cosminbasca

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

@@ -150,6 +150,23 @@ public void postInitialize(PythonCore core) {
         mod.setAttribute("stdlib_home", stdlibHome);
         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
+                false, // dev_mode
+                0, // utf8_mode
+        }));
     }
 
     @Builtin(name = "cache_module_code", minNumOfPositionalArgs = 3)

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

@@ -221,23 +221,6 @@ public void postInitialize(PythonCore core) {
         Object[] warnoptions = new Object[strWarnoptions.length];
         System.arraycopy(strWarnoptions, 0, warnoptions, 0, strWarnoptions.length);
         sys.setAttribute("warnoptions", core.factory().createList(warnoptions));
-        sys.setAttribute("__graalpython_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
-                        false, // dev_mode
-                        0, // utf8_mode
-        }));
 
         Env env = context.getEnv();
         String option = context.getOption(PythonOptions.PythonPath);

graalpython/lib-graalpython/sys.py

@@ -72,7 +72,7 @@ def make_flags_class():
 
     def make_func(i):
         def func(self):
-            return __graalpython_flags__[i]
+            return __graalpython__.flags[i]
         return func
 
     for i, f in enumerate(names):