make the code run on both python 2 and 3

Author: timfel

mx.graalpython/mx_graalpython.py

@@ -50,6 +50,12 @@
 SUITE_SULONG = mx.suite("sulong")
 
 
+# compatibility between Python versions
+PY3 = sys.version_info[0] == 3
+if PY3:
+    raw_input = input
+
+
 def _get_core_home():
     return os.path.join(SUITE.dir, "graalpython", "lib-graalpython")
 
@@ -854,7 +860,7 @@ def import_python_sources(args):
 
     7. Run the tests and fix any remaining issues.
     """.format(mapping))
-    input("Got it?")
+    raw_input("Got it?")
 
     cpy_files = []
     pypy_files = []
@@ -918,9 +924,9 @@ def import_python_sources(args):
 
     # commit and check back
     SUITE.vc.git_command(SUITE.dir, ["add", "."])
-    input("Check that the updated files look as intended, then press RETURN...")
+    raw_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 = input("Should we push python-import (y/N)? ")
+    answer = raw_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

@@ -79,6 +79,25 @@ def is_sandboxed_configuration(conf):
     return conf == CONFIGURATION_SANDBOXED or conf == CONFIGURATION_SANDBOXED_MULTI
 
 
+# from six
+def add_metaclass(metaclass):
+    """Class decorator for creating a class with a metaclass."""
+    def wrapper(cls):
+        orig_vars = cls.__dict__.copy()
+        slots = orig_vars.get('__slots__')
+        if slots is not None:
+            if isinstance(slots, str):
+                slots = [slots]
+            for slots_var in slots:
+                orig_vars.pop(slots_var)
+        orig_vars.pop('__dict__', None)
+        orig_vars.pop('__weakref__', None)
+        if hasattr(cls, '__qualname__'):
+            orig_vars['__qualname__'] = cls.__qualname__
+        return metaclass(cls.__name__, cls.__bases__, orig_vars)
+    return wrapper
+
+
 @contextmanager
 def environ(env):
     def _handle_var(key_value):
@@ -106,7 +125,8 @@ def _handle_var(key_value):
 # the vm definitions
 #
 # ----------------------------------------------------------------------------------------------------------------------
-class AbstractPythonVm(Vm, metaclass=ABCMeta):
+@add_metaclass(ABCMeta)
+class AbstractPythonVm(Vm):
     def __init__(self, config_name, options=None, env=None):
         super(AbstractPythonVm, self).__init__()
         self._config_name = config_name
@@ -154,7 +174,8 @@ def run(self, cwd, args):
         return ret_code, out.data
 
 
-class AbstractPythonIterationsControlVm(AbstractPythonVm, metaclass=ABCMeta):
+@add_metaclass(ABCMeta)
+class AbstractPythonIterationsControlVm(AbstractPythonVm):
     def __init__(self, config_name, options=None, env=None, iterations=None):
         super(AbstractPythonIterationsControlVm, self).__init__(config_name, options=options, env=env)
         try: