move context-specific flag settings based on options into the context initialization paths

Author: timfel

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -346,6 +346,7 @@ protected void launch(Builder contextBuilder) {
         contextBuilder.option("python.QuietFlag", Boolean.toString(quietFlag));
         contextBuilder.option("python.NoUserSiteFlag", Boolean.toString(noUserSite));
         contextBuilder.option("python.NoSiteFlag", Boolean.toString(noSite));
+        contextBuilder.option("python.IgnoreEnvironmentFlag", Boolean.toString(ignoreEnv));
 
         sulongLibraryPath = System.getenv("SULONG_LIBRARY_PATH");
         if (sulongLibraryPath != null) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -437,13 +437,37 @@ public void postInitialize() {
 
     public PythonModule initializeSysModule() {
         PythonModule sys = builtinModules.get("sys");
-        String[] args = getContext().getEnv().getApplicationArguments();
+        PythonContext context = getContext();
+        String[] args = context.getEnv().getApplicationArguments();
         sys.setAttribute("argv", factory().createList(Arrays.copyOf(args, args.length, Object[].class)));
-        String prefix = PythonCore.getSysPrefix(getContext().getEnv());
+        String prefix = PythonCore.getSysPrefix(context.getEnv());
         for (String name : SysModuleBuiltins.SYS_PREFIX_ATTRIBUTES) {
             sys.setAttribute(name, prefix);
         }
+
+        sys.setAttribute("executable", PythonOptions.getOption(context, PythonOptions.Executable));
+        sys.setAttribute("graal_python_home", context.getLanguage().getHome());
+        sys.setAttribute("graal_python_core_home", PythonOptions.getOption(context, PythonOptions.CoreHome));
+        sys.setAttribute("graal_python_stdlib_home", PythonOptions.getOption(context, PythonOptions.StdLibHome));
+        sys.setAttribute("graal_python_opaque_filesystem", PythonOptions.getOption(context, PythonOptions.OpaqueFilesystem));
+        sys.setAttribute("__flags__", factory().createTuple(new Object[]{
+                        false, // bytes_warning
+                        !PythonOptions.getFlag(context, PythonOptions.PythonOptimizeFlag), // debug
+                        true,  // dont_write_bytecode
+                        false, // hash_randomization
+                        PythonOptions.getFlag(context, PythonOptions.IgnoreEnvironmentFlag), // ignore_environment
+                        PythonOptions.getFlag(context, PythonOptions.InspectFlag), // inspect
+                        PythonOptions.getFlag(context, PythonOptions.InspectFlag), // interactive
+                        !context.isExecutableAccessAllowed(), // isolated
+                        PythonOptions.getFlag(context, PythonOptions.NoSiteFlag), // no_site
+                        PythonOptions.getFlag(context, PythonOptions.NoUserSiteFlag), // no_user_site
+                        PythonOptions.getFlag(context, PythonOptions.PythonOptimizeFlag), // optimize
+                        PythonOptions.getFlag(context, PythonOptions.QuietFlag), // quiet
+                        PythonOptions.getFlag(context, PythonOptions.VerboseFlag), // verbose
+        }));
+
         initializeSysPath(sys, args);
+
         return sys;
     }
 
@@ -465,7 +489,6 @@ private void initializeSysPath(PythonModule sys, String[] args) {
         path[pathIdx + 2] = PythonCore.getCoreHome(env) + PythonCore.FILE_SEPARATOR + "modules";
         PList sysPaths = factory().createList(path);
         sys.setAttribute("path", sysPaths);
-        // sysPaths.append(getPythonLibraryExtrasPath());
     }
 
     private static String getScriptPath(Env env, String[] args) {

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

@@ -158,8 +158,6 @@
 import com.oracle.graal.python.nodes.util.CastToIntegerFromIndexNode;
 import com.oracle.graal.python.nodes.util.CastToStringNode;
 import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.graal.python.runtime.PythonCore;
-import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.PythonParser.ParserMode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
@@ -198,13 +196,6 @@ protected List<com.oracle.truffle.api.dsl.NodeFactory<? extends PythonBuiltinBas
         return BuiltinFunctionsFactory.getFactories();
     }
 
-    @Override
-    public void initialize(PythonCore core) {
-        super.initialize(core);
-        boolean optimazeFlag = PythonOptions.getOption(PythonLanguage.getContextRef().get(), PythonOptions.PythonOptimizeFlag);
-        builtinConstants.put(BuiltinNames.__DEBUG__, !optimazeFlag);
-    }
-
     // abs(x)
     @Builtin(name = ABS, fixedNumOfPositionalArgs = 1)
     @GenerateNodeFactory

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

@@ -90,7 +90,6 @@
 
 @CoreFunctions(defineModule = "polyglot")
 public final class InteropModuleBuiltins extends PythonBuiltins {
-
     @Override
     protected List<com.oracle.truffle.api.dsl.NodeFactory<? extends PythonBuiltinNode>> getNodeFactories() {
         return InteropModuleBuiltinsFactory.getFactories();

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

@@ -67,7 +67,6 @@
 import com.oracle.graal.python.nodes.util.CastToIntegerFromIntNode;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonCore;
-import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -118,25 +117,6 @@ public void initialize(PythonCore core) {
         builtinConstants.put("version", PythonLanguage.VERSION +
                         " (" + COMPILE_TIME + ")" +
                         "\n[" + Truffle.getRuntime().getName() + ", Java " + System.getProperty("java.version") + "]");
-        builtinConstants.put("flags", core.factory().createTuple(new Object[]{
-                        false, // bytes_warning
-                        false, // debug
-                        true,  // dont_write_bytecode
-                        false, // hash_randomization
-                        false, // ignore_environment
-                        PythonOptions.getFlag(core.getContext(), PythonOptions.InspectFlag), // inspect
-                        PythonOptions.getFlag(core.getContext(), PythonOptions.InspectFlag), // interactive
-                        false, // isolated
-                        PythonOptions.getFlag(core.getContext(), PythonOptions.NoSiteFlag), // no_site
-                        PythonOptions.getFlag(core.getContext(), PythonOptions.NoUserSiteFlag), // no_user_site
-                        false, // optimize
-                        PythonOptions.getFlag(core.getContext(), PythonOptions.QuietFlag), // quiet
-                        PythonOptions.getFlag(core.getContext(), PythonOptions.VerboseFlag), // verbose
-        }));
-        builtinConstants.put("graal_python_home", core.getContext().getLanguage().getHome());
-        builtinConstants.put("graal_python_core_home", PythonOptions.getOption(core.getContext(), PythonOptions.CoreHome));
-        builtinConstants.put("graal_python_stdlib_home", PythonOptions.getOption(core.getContext(), PythonOptions.StdLibHome));
-        builtinConstants.put("graal_python_opaque_filesystem", PythonOptions.getOption(core.getContext(), PythonOptions.OpaqueFilesystem));
         builtinConstants.put("graal_python_is_native", TruffleOptions.AOT);
         // the default values taken from JPython
         builtinConstants.put("float_info", core.factory().createTuple(new Object[]{

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -27,6 +27,7 @@
 
 import static com.oracle.graal.python.builtins.objects.thread.PThread.GRAALPYTHON_THREADS;
 import static com.oracle.graal.python.nodes.BuiltinNames.__BUILTINS__;
+import static com.oracle.graal.python.nodes.BuiltinNames.__DEBUG__;
 import static com.oracle.graal.python.nodes.BuiltinNames.__MAIN__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__FILE__;
 
@@ -234,9 +235,11 @@ public void patch(Env newEnv) {
 
     private void setupRuntimeInformation() {
         PythonModule sysModule = core.initializeSysModule();
-        sysModule.setAttribute("executable", PythonOptions.getOption(core.getContext(), PythonOptions.Executable));
         sysModules = (PDict) sysModule.getAttribute("modules");
+
         builtinsModule = (PythonModule) sysModules.getItem("builtins");
+        builtinsModule.setAttribute(__DEBUG__, !PythonOptions.getOption(PythonLanguage.getContextRef().get(), PythonOptions.PythonOptimizeFlag));
+
         mainModule = core.factory().createPythonModule(__MAIN__);
         mainModule.setAttribute(__BUILTINS__, builtinsModule);
         mainModule.setDict(core.factory().createDictFixedStorage(mainModule));

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonOptions.java

@@ -66,6 +66,9 @@ private PythonOptions() {
     @Option(category = OptionCategory.USER, help = "Equivalent to the Python -s flag. Don't add user site directory to sys.path.") //
     public static final OptionKey<Boolean> NoUserSiteFlag = new OptionKey<>(false);
 
+    @Option(category = OptionCategory.USER, help = "Equivalent to the Python -E flag. Ignore PYTHON* environment variables.") //
+    public static final OptionKey<Boolean> IgnoreEnvironmentFlag = new OptionKey<>(false);
+
     @Option(category = OptionCategory.USER, help = "Equivalent to setting the PYTHONPATH environment variable for the standard launcher. ':'-separated list of directories prefixed to the default module search path.") //
     public static final OptionKey<String> PythonPath = new OptionKey<>("");
 

graalpython/lib-graalpython/posix.py

@@ -39,7 +39,6 @@
 
 from _descriptor import make_named_tuple_class
 from sys import graal_python_is_native
-from sys import executable as graal_python_executable
 
 stat_result = make_named_tuple_class("stat_result", [
     "st_mode", "st_ino", "st_dev", "st_nlink",
@@ -59,8 +58,10 @@ def stat(filename, follow_symlinks=True):
 
 @__builtin__
 def lstat(filename):
-    if not graal_python_is_native and filename == graal_python_executable:
-        return stat_result((0,0,0,0,0,0,0,0,0,0))
+    if not graal_python_is_native:
+        from sys import executable as graal_python_executable
+        if filename == graal_python_executable:
+            return stat_result((0,0,0,0,0,0,0,0,0,0))
     return stat_result(old_stat(filename, False))
 
 

graalpython/lib-graalpython/sys.py

@@ -56,23 +56,27 @@ def make_implementation_info():
 
 def make_flags_class():
     from _descriptor import make_named_tuple_class
-    return make_named_tuple_class(
-        "flags",
-        ["bytes_warning",
-         "debug",
-         "dont_write_bytecode",
-         "hash_randomization",
-         "ignore_environment",
-         "inspect",
-         "interactive",
-         "isolated",
-         "no_site",
-         "no_user_site",
-         "optimize",
-         "quiet",
-         "verbose"]
-    )
-flags = make_flags_class()(flags)
+    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"]
+
+    flags_class = make_named_tuple_class("sys.flags", names)
+
+    def make_func(i):
+        def func(self):
+            return __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()()
 del make_flags_class