Fix style and copyrights

Author: fangerer

graalpython/com.oracle.graal.python.cext/include/common/runtime/ctx_tracker.h

@@ -1,3 +1,27 @@
+/* MIT License
+ *
+ * Copyright (c) 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2019 pyhandle
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 #ifndef HPY_COMMON_RUNTIME_CTX_TRACKER_H
 #define HPY_COMMON_RUNTIME_CTX_TRACKER_H
 

graalpython/lib-graalpython/modules/hpy/test/test_tracker.py

@@ -1,3 +1,26 @@
+# MIT License
+# 
+# Copyright (c) 2021, Oracle and/or its affiliates.
+# Copyright (c) 2019 pyhandle
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
 """
 NOTE: this tests are also meant to be run as PyPy "applevel" tests.
 

mx.graalpython/copyrights/overrides

@@ -80,6 +80,7 @@ graalpython/com.oracle.graal.python.cext/include/common/runtime/ctx_module.h,hpy
 graalpython/com.oracle.graal.python.cext/include/common/runtime/ctx_tuplebuilder.h,hpy.copyright
 graalpython/com.oracle.graal.python.cext/include/common/runtime/ctx_tuple.h,hpy.copyright
 graalpython/com.oracle.graal.python.cext/include/common/runtime/ctx_type.h,hpy.copyright
+graalpython/com.oracle.graal.python.cext/include/common/runtime/ctx_tracker.h,hpy.copyright
 graalpython/com.oracle.graal.python.cext/include/common/version.h,hpy.copyright
 graalpython/com.oracle.graal.python.cext/include/compile.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/complexobject.h,python.copyright
@@ -557,13 +558,15 @@ graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence
 graalpython/lib-graalpython/_collections.py,pypy.copyright
 graalpython/lib-graalpython/_io.py,pypy.copyright
 graalpython/lib-graalpython/itertools.py,pypy.copyright
-graalpython/lib-graalpython/modules/hpy/devel.py,hpy.copyright
-graalpython/lib-graalpython/modules/hpy/src/runtime/argparse.c,hpy.copyright
-graalpython/lib-graalpython/modules/hpy/src/runtime/ctx_listbuilder.c,hpy.copyright
-graalpython/lib-graalpython/modules/hpy/src/runtime/ctx_module.c,hpy.copyright
-graalpython/lib-graalpython/modules/hpy/src/runtime/ctx_tuple.c,hpy.copyright
-graalpython/lib-graalpython/modules/hpy/src/runtime/ctx_tuplebuilder.c,hpy.copyright
-graalpython/lib-graalpython/modules/hpy/src/runtime/ctx_type.c,hpy.copyright
+graalpython/lib-graalpython/modules/hpy/devel/__init__.py,hpy.copyright
+graalpython/lib-graalpython/modules/hpy/devel/src/runtime/argparse.c,hpy.copyright
+graalpython/lib-graalpython/modules/hpy/devel/src/runtime/ctx_listbuilder.c,hpy.copyright
+graalpython/lib-graalpython/modules/hpy/devel/src/runtime/ctx_module.c,hpy.copyright
+graalpython/lib-graalpython/modules/hpy/devel/src/runtime/ctx_tracker.c,hpy.copyright
+graalpython/lib-graalpython/modules/hpy/devel/src/runtime/ctx_tuple.c,hpy.copyright
+graalpython/lib-graalpython/modules/hpy/devel/src/runtime/ctx_tuplebuilder.c,hpy.copyright
+graalpython/lib-graalpython/modules/hpy/devel/src/runtime/ctx_type.c,hpy.copyright
+graalpython/lib-graalpython/modules/hpy/devel/version.py,hpy.copyright
 graalpython/lib-graalpython/modules/hpy/test/__init__.py,hpy.copyright
 graalpython/lib-graalpython/modules/hpy/test/check_py27_compat.py,hpy.copyright
 graalpython/lib-graalpython/modules/hpy/test/conftest.py,hpy.copyright
@@ -584,7 +587,7 @@ graalpython/lib-graalpython/modules/hpy/test/test_number.py,hpy.copyright
 graalpython/lib-graalpython/modules/hpy/test/test_object.py,hpy.copyright
 graalpython/lib-graalpython/modules/hpy/test/test_slots.py,hpy.copyright
 graalpython/lib-graalpython/modules/hpy/test/test_support.py,hpy.copyright
-graalpython/lib-graalpython/modules/hpy/version.py,hpy.copyright
+graalpython/lib-graalpython/modules/hpy/test/test_tracker.py,hpy.copyright
 graalpython/lib-graalpython/object.py,pypy.copyright
 graalpython/lib-graalpython/str.py,pypy.copyright
 graalpython/lib-graalpython/timsort.py,pypy.copyright

mx.graalpython/mx_graalpython.py

@@ -2019,54 +2019,55 @@ def import_files(from_dir, to_dir):
                 dest_file = join(to_dir, relative_dir_path, filename)
                 import_file(src_file, dest_file)
 
-    def remove_inexisting_file(src_file, dest_file):
+    def remove_inexistent_file(src_file, dest_file):
         if not os.path.exists(dest_file):
             mx.logv("Removing file {} since {} does not exist".format(src_file, dest_file))
             vc.git_command(SUITE.dir, ["rm", src_file])
 
-    def remove_inexisting_files(hpy_dir, our_dir):
+    def remove_inexistent_files(hpy_dir, our_dir):
         mx.log("Looking for removed files in {} (HPy reference dir {})".format(our_dir, hpy_dir))
         for dirpath, _, filenames in os.walk(our_dir):
             relative_dir_path = os.path.relpath(dirpath, start=our_dir)
             for filename in filenames:
                 src_file = join(dirpath, filename)
                 dest_file = join(hpy_dir, relative_dir_path, filename)
-                remove_inexisting_file(src_file, dest_file)
+                remove_inexistent_file(src_file, dest_file)
 
     # headers go into 'com.oracle.graal.python.cext/include'
     header_dest = join(mx.dependency("com.oracle.graal.python.cext").dir, "include")
 
     # copy headers from .../hpy/hpy/devel/include' to 'header_dest'
     # but exclude subdir 'cpython' (since that's only for CPython)
     import_files(hpy_repo_include_dir, header_dest)
-    remove_inexisting_files(hpy_repo_include_dir, header_dest)
+    remove_inexistent_files(hpy_repo_include_dir, header_dest)
 
     # runtime sources go into 'lib-graalpython/module/hpy/devel/src'
     runtime_files_dest = join(_get_core_home(), "modules", "hpy", "devel", "src")
     import_files(hpy_repo_runtime_dir, runtime_files_dest)
-    remove_inexisting_files(hpy_repo_runtime_dir, runtime_files_dest)
+    remove_inexistent_files(hpy_repo_runtime_dir, runtime_files_dest)
 
     # tests go to 'lib-graalpython/module/hpy/tests'
     test_files_dest = _hpy_test_root()
     import_files(hpy_repo_test_dir, test_files_dest)
-    remove_inexisting_files(hpy_repo_test_dir, test_files_dest)
+    remove_inexistent_files(hpy_repo_test_dir, test_files_dest)
 
     # 'version.py' goes to 'lib-graalpython/module/hpy/devel/'
     dest_version_file = join(_get_core_home(), "modules", "hpy", "devel", "version.py")
     import_file(join(hpy_repo_path, "hpy", "devel", "version.py"), dest_version_file)
 
-    # read version from 'version.py'
-    with open(dest_version_file, "r") as f:
-        dummy_globals = {}
-        exec(f.read(), dummy_globals)
-        imported_version = dummy_globals["__version__"]
+    # import 'version.py' by path and read '__version__'
+    from importlib import util
+    spec = util.spec_from_file_location("version", dest_version_file)
+    version_module = util.module_from_spec(spec)
+    spec.loader.exec_module(version_module)
+    imported_version = version_module.__version__
 
     SUITE.vc.git_command(SUITE.dir, ["add", header_dest, runtime_files_dest, test_files_dest])
     raw_input("Check that the updated files look as intended, then press RETURN...")
     SUITE.vc.commit(SUITE.dir, "Update HPy inlined files: %s" % import_version)
     SUITE.vc.git_command(SUITE.dir, ["checkout", "-"])
     SUITE.vc.git_command(SUITE.dir, ["merge", HPY_IMPORT_ORPHAN_BRANCH_NAME])
-    
+
     # update PKG-INFO version
     pkg_info_file = join(_get_core_home(), "modules", "hpy.devel.egg-info", "PKG-INFO")
     with open(pkg_info_file, "w") as f: