support -W option

Author: timfel

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

@@ -88,6 +88,7 @@ public static void main(String[] args) {
     private boolean wantsExperimental = false;
     private Map<String, String> enginePolyglotOptions;
     private boolean dontWriteBytecode = false;
+    private String warnOptions = null;
 
     @Override
     protected List<String> preprocessArguments(List<String> givenArgs, Map<String, String> polyglotOptions) {
@@ -153,6 +154,20 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S
                 case "-S":
                     noSite = true;
                     break;
+                case "-W":
+                    i += 1;
+                    if (warnOptions == null) {
+                        warnOptions = "";
+                    } else {
+                        warnOptions += ",";
+                    }
+                    if (i < arguments.size()) {
+                        warnOptions += arguments.get(i);
+                    } else {
+                        print("Argument expected for the -W option");
+                        printShortHelp();
+                    }
+                    break;
                 case "-X":
                     i++;
                     if (i < arguments.size()) {
@@ -230,6 +245,14 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S
                         inputFile = arg;
                         programArgs.add(inputFile);
                         break;
+                    } else if (arg.startsWith("-W")) {
+                        // alternate allowed form
+                        if (warnOptions == null) {
+                            warnOptions = "";
+                        } else {
+                            warnOptions += ",";
+                        }
+                        warnOptions += arg.substring(2);
                     } else if (!arg.startsWith("--") && arg.length() > 2) {
                         // short arguments can be given together
                         String[] split = arg.substring(1).split("");
@@ -372,12 +395,17 @@ protected void launch(Builder contextBuilder) {
             verboseFlag = verboseFlag || System.getenv("PYTHONVERBOSE") != null;
             unbufferedIO = unbufferedIO || System.getenv("PYTHONUNBUFFERED") != null;
             dontWriteBytecode = dontWriteBytecode || System.getenv("PYTHONDONTWRITEBYTECODE") != null;
+            if (warnOptions == null) {
+                warnOptions = System.getenv("PYTHONWARNINGS");
+            }
             String cachePrefix = System.getenv("PYTHONPYCACHEPREFIX");
             if (cachePrefix != null) {
                 contextBuilder.option("python.PyCachePrefix", cachePrefix);
             }
         }
-
+        if (warnOptions == null || warnOptions.isEmpty()) {
+            warnOptions = "default";
+        }
         String executable = getContextOptionIfSetViaCommandLine("python.Executable");
         if (executable != null) {
             contextBuilder.option("python.ExecutableList", executable);
@@ -394,6 +422,7 @@ protected void launch(Builder contextBuilder) {
         contextBuilder.option("python.InspectFlag", Boolean.toString(inspectFlag));
         contextBuilder.option("python.VerboseFlag", Boolean.toString(verboseFlag));
         contextBuilder.option("python.IsolateFlag", Boolean.toString(isolateFlag));
+        contextBuilder.option("python.WarnOptions", warnOptions);
         contextBuilder.option("python.DontWriteBytecodeFlag", Boolean.toString(dontWriteBytecode));
         if (verboseFlag) {
             contextBuilder.option("log.python.level", "FINE");
@@ -581,9 +610,8 @@ protected void printHelp(OptionCategory maxCategory) {
                         "-V     : print the Python version number and exit (also --version)\n" +
                         "         when given twice, print more information about the build\n" +
                         "-X opt : CPython implementation-specific options. Ignored on GraalPython\n" +
-                        // "-W arg : warning control; arg is
-                        // action:message:category:module:lineno\n" +
-                        // " also PYTHONWARNINGS=arg\n" +
+                        "-W arg : warning control; arg is action:message:category:module:lineno\n" +
+                        "         also PYTHONWARNINGS=arg\n" +
                         // "-x : skip first line of source, allowing use of non-Unix forms of
                         // #!cmd\n" +
                         // "-3 : warn about Python 3.x incompatibilities that 2to3 cannot trivially

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

@@ -199,6 +199,7 @@ public void postInitialize(PythonCore core) {
         sys.setAttribute("dont_write_bytecode", context.getOption(PythonOptions.DontWriteBytecodeFlag));
         String pycachePrefix = context.getOption(PythonOptions.PyCachePrefix);
         sys.setAttribute("pycache_prefix", pycachePrefix.isEmpty() ? PNone.NONE : pycachePrefix);
+        sys.setAttribute("warnoptions", core.factory().createTuple(context.getOption(PythonOptions.WarnOptions).split(",")));
         sys.setAttribute("__flags__", core.factory().createTuple(new Object[]{
                         false, // bytes_warning
                         !context.getOption(PythonOptions.PythonOptimizeFlag), // debug

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

@@ -114,6 +114,9 @@ private PythonOptions() {
                     "Equivalent to setting the PYTHONPYCACHEPREFIX environment variable for the standard launcher.", stability = OptionStability.STABLE) //
     public static final OptionKey<String> PyCachePrefix = new OptionKey<>("");
 
+    @Option(category = OptionCategory.USER, help = "Equivalent to setting the PYTHONWARNINGS environment variable for the standard launcher.", stability = OptionStability.STABLE) //
+    public static final OptionKey<String> WarnOptions = new OptionKey<>("");
+
     @Option(category = OptionCategory.INTERNAL, help = "Set the location of C API home. Overrides any environment variables or Java options.", stability = OptionStability.STABLE) //
     public static final OptionKey<String> CAPI = new OptionKey<>("");