adapt default verbosity and logging behaviour of python

Author: timfel

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

@@ -163,11 +163,13 @@ protected void launch(Builder contextBuilder) {
         // setting this to make sure our TopLevelExceptionHandler calls the excepthook
         // to print Python exceptions
         contextBuilder.option("python.AlwaysRunExcepthook", "true");
+        contextBuilder.option("log.level", "WARNING");
         if (inspectFlag) {
             contextBuilder.option("python.InspectFlag", "true");
         }
         if (verboseFlag) {
             contextBuilder.option("python.VerboseFlag", "true");
+            contextBuilder.option("log.python.level", "FINE");
         }
 
         ConsoleHandler consoleHandler = createConsoleHandler(System.in, System.out);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -49,7 +49,6 @@
 import com.oracle.graal.python.nodes.control.TopLevelExceptionHandler;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
-import com.oracle.graal.python.nodes.statement.ImportNode;
 import com.oracle.graal.python.parser.PythonParserImpl;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonCore;
@@ -216,29 +215,31 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
         PythonContext context = this.getContextReference().get();
         PythonCore pythonCore = context.getCore();
         Source source = request.getSource();
+        CompilerDirectives.transferToInterpreter();
         if (pythonCore.isInitialized()) {
             context.initializeMainModule(source.getPath());
 
             // if we are running the interpreter, module 'site' is automatically imported
             if (source.isInteractive()) {
-                CompilerAsserts.neverPartOfCompilation();
-                // no frame required
-                new ImportNode("site").execute(null);
+                Truffle.getRuntime().createCallTarget(new TopLevelExceptionHandler(this, doParse(pythonCore, Source.newBuilder(ID, "import site", "<site import>").build()))).call();
             }
         }
-        RootNode root;
+        RootNode root = doParse(pythonCore, source);
+        if (pythonCore.isInitialized()) {
+            return Truffle.getRuntime().createCallTarget(new TopLevelExceptionHandler(this, root));
+        } else {
+            return Truffle.getRuntime().createCallTarget(root);
+        }
+    }
+
+    private RootNode doParse(PythonCore pythonCore, Source source) {
         try {
-            root = (RootNode) pythonCore.getParser().parse(source.isInteractive() ? ParserMode.InteractiveStatement : ParserMode.File, pythonCore, source, null);
+            return (RootNode) pythonCore.getParser().parse(source.isInteractive() ? ParserMode.InteractiveStatement : ParserMode.File, pythonCore, source, null);
         } catch (PException e) {
             // handle PException during parsing (PIncompleteSourceException will propagate through)
             Truffle.getRuntime().createCallTarget(new TopLevelExceptionHandler(this, e)).call();
             throw e;
         }
-        if (pythonCore.isInitialized()) {
-            return Truffle.getRuntime().createCallTarget(new TopLevelExceptionHandler(this, root));
-        } else {
-            return Truffle.getRuntime().createCallTarget(root);
-        }
     }
 
     @Override
@@ -370,7 +371,7 @@ protected String toString(PythonContext context, Object value) {
     }
 
     public static TruffleLogger getLogger() {
-        return TruffleLogger.getLogger(ID, PythonLanguage.class);
+        return TruffleLogger.getLogger(ID);
     }
 
     public static Source newSource(PythonContext ctxt, String src, String name) {

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

@@ -162,12 +162,12 @@ public final class Python3Core implements PythonCore {
                     "method",
                     "code",
                     "_warnings",
+                    "posix",
+                    "_io",
                     "_frozen_importlib_external",
                     "_frozen_importlib",
-                    "posix",
                     "classes",
                     "_weakref",
-                    "_io",
                     "set",
                     "itertools",
                     "base_exception",

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

@@ -71,6 +71,7 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonVarargsBuiltinNode;
 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;
@@ -159,7 +160,7 @@ public void initialize(PythonCore core) {
                         false, // no_user_site
                         false, // optimize
                         false, // quiet
-                        false, // verbose
+                        PythonOptions.getOption(core.getContext(), PythonOptions.VerboseFlag).booleanValue(), // verbose
         }));
         // the default values taken from JPython
         builtinConstants.put("float_info", core.factory().createTuple(new Object[]{