fix pylint issues

Author: timfel

mx.graalpython/mx_graalpython.py

@@ -21,6 +21,8 @@
 # AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
+from __future__ import print_function
+
 import os
 import platform
 import re
@@ -34,11 +36,10 @@
 import mx_gate
 import mx_sdk
 import mx_subst
-import mx_urlrewrites
 from mx_gate import Task
 from mx_graalpython_bench_param import PATH_MESO, BENCHMARKS
 from mx_graalpython_benchmark import PythonBenchmarkSuite, python_vm_registry, CPythonVm, PyPyVm, GraalPythonVm, \
-    CONFIGURATION_DEFAULT, CONFIGURATION_EXPERIMENTAL_SPLITTING, CONFIGURATION_SANDBOXED
+    CONFIGURATION_DEFAULT, CONFIG_EXPERIMENTAL_SPLITTING, CONFIGURATION_SANDBOXED
 from mx_unittest import unittest
 
 SUITE = mx.suite('graalpython')
@@ -161,7 +162,7 @@ def punittest(args):
     # IMPORTANT! This must not be --suite graalpython, because a
     # --dynamicimports sulong will otherwise not put sulong.jar on the
     # classpath, which means we cannot run our C extension tests!
-    unittest(args + ['--regex', '(graal\.python)|(com\.oracle\.truffle\.tck\.tests)', "-Dgraal.TraceTruffleCompilation=true"])
+    unittest(args + ['--regex', r'(graal\.python)|(com\.oracle\.truffle\.tck\.tests)', "-Dgraal.TraceTruffleCompilation=true"])
 
 
 def nativebuild(args):
@@ -247,7 +248,8 @@ def python_svm(args):
     return svm_image
 
 
-def gate_unittests(args=[], subdir=""):
+def gate_unittests(args=None, subdir=""):
+    args = args or []
     _graalpytest_driver = "graalpython/com.oracle.graal.python.test/src/graalpytest.py"
     _test_project = "graalpython/com.oracle.graal.python.test/"
     for idx, arg in enumerate(args):
@@ -273,7 +275,9 @@ def gate_unittests(args=[], subdir=""):
         mx.command_function("python")(["--python.CatchAllExceptions=true", "--python.OpaqueFilesystem"] + pre_args + test_args + post_args)
 
 
-def run_python_unittests(python_binary, args=[], aot_compatible=True, exclude=[]):
+def run_python_unittests(python_binary, args=None, aot_compatible=True, exclude=None):
+    args = args or []
+    exclude = exclude or []
     # tests root directory
     tests_folder = os.path.join(SUITE.dir, "graalpython", "com.oracle.graal.python.test", "src", "tests")
 
@@ -602,7 +606,7 @@ def update_import(name, rev="origin/master", callback=None):
     suitefile = os.path.join(primary.dir, "mx." + primary.name, "suite.py")
     with open(suitefile, 'r') as f:
         contents = f.read()
-    dep_re = re.compile("['\"]name['\"]:\s+['\"]%s['\"],\s+['\"]version['\"]:\s+['\"]([a-z0-9]+)['\"]" % name, re.MULTILINE)
+    dep_re = re.compile(r"['\"]name['\"]:\s+['\"]%s['\"],\s+['\"]version['\"]:\s+['\"]([a-z0-9]+)['\"]" % name, re.MULTILINE)
     dep_match = dep_re.search(contents)
     if dep_match:
         start = dep_match.start(1)
@@ -620,7 +624,7 @@ def update_import_cmd(args):
         callback = None
         if name == "sulong":
             join = os.path.join
-            callback=lambda: shutil.copy(
+            callback = lambda: shutil.copy(
                 join(SUITE_SULONG.dir, "include", "truffle.h"),
                 join(SUITE.dir, "graalpython", "com.oracle.graal.python.cext", "include", "truffle.h")
             ) and shutil.copy(
@@ -676,7 +680,7 @@ def import_python_sources(args):
     pypy_sources = args.pypy
     import_version = args.msg
 
-    print """
+    print("""
     So you think you want to update the inlined sources? Here is how it will go:
 
     1. We'll first check the copyrights check overrides file to identify the
@@ -717,7 +721,7 @@ def import_python_sources(args):
        python-import.
 
     7. Run the tests and fix any remaining issues.
-    """.format(mapping)
+    """.format(mapping))
     raw_input("Got it?")
 
     cpy_files = []
@@ -743,7 +747,7 @@ def import_python_sources(args):
             if name.startswith("test_") or name.endswith("_tests.py"):
                 original_file = inlined_file
             else:
-                for root, dirs, files in os.walk(pypy_sources):
+                for root, _, files in os.walk(pypy_sources):
                     if os.path.basename(name) in files:
                         original_file = os.path.join(root, name)
                         try:
@@ -761,7 +765,7 @@ def import_python_sources(args):
         name = os.path.basename(inlined_file)
         name = mapping.get(name, name)
         if inlined_file.endswith(".h") or inlined_file.endswith(".c"):
-            for root, dirs, files in os.walk(python_sources):
+            for root, _, files in os.walk(python_sources):
                 if os.path.basename(name) in files:
                     original_file = os.path.join(root, name)
                     try:
@@ -846,7 +850,7 @@ def _register_vms(namespace):
     python_vm_registry.add_vm(CPythonVm(CONFIGURATION_DEFAULT), SUITE)
     python_vm_registry.add_vm(PyPyVm(CONFIGURATION_DEFAULT), SUITE)
     python_vm_registry.add_vm(GraalPythonVm(config_name=CONFIGURATION_DEFAULT), SUITE, 10)
-    python_vm_registry.add_vm(GraalPythonVm(config_name=CONFIGURATION_EXPERIMENTAL_SPLITTING, extra_vm_args=[
+    python_vm_registry.add_vm(GraalPythonVm(config_name=CONFIG_EXPERIMENTAL_SPLITTING, extra_vm_args=[
         '-Dgraal.TruffleExperimentalSplitting=true',
         '-Dgraal.TruffleExperimentalSplittingAllowForcedSplits=false'
     ]), SUITE, 10)

mx.graalpython/mx_graalpython_benchmark.py

@@ -55,7 +55,7 @@
 SUBGROUP_GRAAL_PYTHON = "graalpython"
 PYTHON_VM_REGISTRY_NAME = "Python"
 CONFIGURATION_DEFAULT = "default"
-CONFIGURATION_EXPERIMENTAL_SPLITTING = "experimental_splitting"
+CONFIG_EXPERIMENTAL_SPLITTING = "experimental_splitting"
 CONFIGURATION_SANDBOXED = "sandboxed"
 
 DEFAULT_ITERATIONS = 10
@@ -132,7 +132,7 @@ def __init__(self, config_name, options=None, iterations=None):
         super(AbstractPythonIterationsControlVm, self).__init__(config_name, options)
         try:
             self._iterations = int(iterations)
-        except Exception:
+        except:
             self._iterations = None
 
     def _override_iterations_args(self, args):

mx.graalpython/suite.py

@@ -1,3 +1,4 @@
+# pylint: disable=anomalous-backslash-in-string
 suite = {
     # --------------------------------------------------------------------------------------------------------------
     #
@@ -163,7 +164,8 @@
                 "sdk:GRAAL_SDK",
                 "sdk:LAUNCHER_COMMON",
             ],
-            "javaCompliance": "1.8",
+            "javaCompliance": "8+",
+            "checkstyle": "com.oracle.graal.python",
         },
 
         # GRAALPYTHON
@@ -177,8 +179,8 @@
                 "regex:TREGEX",
             ],
             "buildDependencies": ["com.oracle.graal.python.parser.antlr"],
-            "checkstyle": "com.oracle.graal.python",
-            "javaCompliance": "1.8",
+            "javaCompliance" : "8+",
+            "checkstyleVersion" : "8.8",
             "annotationProcessors": ["truffle:TRUFFLE_DSL_PROCESSOR"],
             "workingSets": "Truffle,Python",
         },
@@ -194,7 +196,7 @@
                 "mx:JUNIT"
             ],
             "checkstyle": "com.oracle.graal.python",
-            "javaCompliance": "1.8",
+            "javaCompliance": "8+",
             "annotationProcessors": ["truffle:TRUFFLE_DSL_PROCESSOR"],
             "workingSets": "Truffle,Python",
             "testProject": True,
@@ -208,7 +210,7 @@
                 "mx:JUNIT"
             ],
             "checkstyle": "com.oracle.graal.python",
-            "javaCompliance": "1.8",
+            "javaCompliance": "8+",
             "workingSets": "Truffle,Python",
             "testProject": True,
         },