run 2to3

Author: timfel

mx.graalpython/mx_graalpython.py

@@ -854,7 +854,7 @@ def import_python_sources(args):
 
     7. Run the tests and fix any remaining issues.
     """.format(mapping))
-    raw_input("Got it?")
+    input("Got it?")
 
     cpy_files = []
     pypy_files = []
@@ -918,9 +918,9 @@ def import_python_sources(args):
 
     # commit and check back
     SUITE.vc.git_command(SUITE.dir, ["add", "."])
-    raw_input("Check that the updated files look as intended, then press RETURN...")
+    input("Check that the updated files look as intended, then press RETURN...")
     SUITE.vc.commit(SUITE.dir, "Update Python inlined files: %s" % import_version)
-    answer = raw_input("Should we push python-import (y/N)? ")
+    answer = input("Should we push python-import (y/N)? ")
     if answer and answer in "Yy":
         SUITE.vc.git_command(SUITE.dir, ["push", "origin", "python-import:python-import"])
     SUITE.vc.update(SUITE.dir, rev=tip)

mx.graalpython/mx_graalpython_benchmark.py

@@ -81,33 +81,32 @@ def is_sandboxed_configuration(conf):
 
 @contextmanager
 def environ(env):
-    def _handle_var((k, v)):
+    def _handle_var(key_value):
+        (k, v) = key_value
         if v is None:
             del os.environ[k]
         else:
             os.environ[k] = str(v)
 
     if env:
         prev_env = {v: os.getenv(v) for v in env}
-        map(_handle_var, env.items())
+        list(map(_handle_var, list(env.items())))
     else:
         prev_env = None
 
     try:
         yield
     finally:
         if prev_env:
-            map(_handle_var, prev_env.items())
+            list(map(_handle_var, list(prev_env.items())))
 
 
 # ----------------------------------------------------------------------------------------------------------------------
 #
 # the vm definitions
 #
 # ----------------------------------------------------------------------------------------------------------------------
-class AbstractPythonVm(Vm):
-    __metaclass__ = ABCMeta
-
+class AbstractPythonVm(Vm, metaclass=ABCMeta):
     def __init__(self, config_name, options=None, env=None):
         super(AbstractPythonVm, self).__init__()
         self._config_name = config_name
@@ -155,9 +154,7 @@ def run(self, cwd, args):
         return ret_code, out.data
 
 
-class AbstractPythonIterationsControlVm(AbstractPythonVm):
-    __metaclass__ = ABCMeta
-
+class AbstractPythonIterationsControlVm(AbstractPythonVm, metaclass=ABCMeta):
     def __init__(self, config_name, options=None, env=None, iterations=None):
         super(AbstractPythonIterationsControlVm, self).__init__(config_name, options=options, env=env)
         try:
@@ -420,7 +417,7 @@ def createVmCommandLineArgs(self, benchmarks, bmSuiteArgs):
             for pth in self._python_path:
                 if hasattr(pth, '__call__'):
                     pth = pth()
-                assert isinstance(pth, (str, unicode))
+                assert isinstance(pth, str)
                 python_path.append(pth)
             cmd_args += ['-p', ",".join(python_path)]
 
@@ -434,7 +431,7 @@ def createVmCommandLineArgs(self, benchmarks, bmSuiteArgs):
         return vm_options + vm_args + cmd_args
 
     def benchmarkList(self, bm_suite_args):
-        return self._benchmarks.keys()
+        return list(self._benchmarks.keys())
 
     def benchmarks(self):
         raise FutureWarning('the benchmarks method has been deprecated for VmBenchmarkSuite instances, '