Cleanup

Author: msimacek

graalpython/com.oracle.graal.python.benchmarks/python/meso/richards3.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright 2008-2010 Isaac Gouy
 # Copyright (c) 2013, 2014, Regents of the University of California
-# Copyright (c) 2017, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2017, 2022, Oracle and/or its affiliates.
 # All rights reserved.
 #
 # Revised BSD license
@@ -45,7 +45,7 @@
 #  Translation from C++, Mario Wolczko
 #  Outer loop added by Alex Jacoby
 
-# from __future__ import print_function
+from __future__ import print_function
 
 # Task IDs
 I_IDLE = 1

graalpython/com.oracle.graal.python.pegparser.generator/main_parser_gen.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 # Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/PythonTests.java

@@ -333,8 +333,12 @@ public static File getTestFile(Path filename) {
         }
     }
 
+    public static boolean usingBytecodeCompiler() {
+        return System.getProperty("useBytecodeCompiler") != null;
+    }
+
     private static org.graalvm.polyglot.Source.Builder configureBuilder(org.graalvm.polyglot.Source.Builder builder) {
-        if (System.getProperty("useBytecodeCompiler") != null) {
+        if (usingBytecodeCompiler()) {
             return builder.mimeType(PythonLanguage.MIME_TYPE_SOURCE_FOR_BYTECODE);
         }
         return builder;

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/grammar/ArgumentsTests.java

@@ -27,7 +27,9 @@
 
 import static com.oracle.graal.python.test.PythonTests.assertLastLineErrorContains;
 import static com.oracle.graal.python.test.PythonTests.assertPrints;
+import static com.oracle.graal.python.test.PythonTests.usingBytecodeCompiler;
 
+import org.junit.Assume;
 import org.junit.Test;
 
 public class ArgumentsTests {
@@ -143,6 +145,8 @@ public void KwArgs2() {
 
     @Test
     public void kwargsMerge() {
+        // TODO AST interpreter doesn't maintain the order correctly
+        Assume.assumeTrue(usingBytecodeCompiler());
         assertPrints("{'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5}\n", "\n" +
                         "def foo(**kwargs):\n" +
                         "  print(kwargs)\n" +

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/generator/PGenerator.java

@@ -54,7 +54,6 @@ public final class PGenerator extends PythonBuiltinObject {
     private String name;
     private String qualname;
     private boolean usesBytecode;
-    private int bci;
     /**
      * Call targets with copies of the generator's AST. Each call target corresponds to one possible
      * entry point into the generator: the first call, and continuation for each yield. Each AST can