Reduce diff with imported CPython files

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_call.txt

@@ -62,7 +62,3 @@
 *graalpython.lib-python.3.test.test_call.FastCallTests.test_vectorcall
 *graalpython.lib-python.3.test.test_call.FastCallTests.test_vectorcall_dict
 *graalpython.lib-python.3.test.test_call.FunctionCalls.test_kwargs_order
-*graalpython.lib-python.3.test.test_call.TestPEP590.test_method_descriptor_flag
-*graalpython.lib-python.3.test.test_call.TestPEP590.test_vectorcall
-*graalpython.lib-python.3.test.test_call.TestPEP590.test_vectorcall_flag
-*graalpython.lib-python.3.test.test_call.TestPEP590.test_vectorcall_override

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_importlib.txt

@@ -629,6 +629,8 @@
 *test.test_importlib.test_abc.Frozen_InspectLoader.test_subclasses
 *test.test_importlib.test_abc.Frozen_InspectLoader.test_superclasses
 *test.test_importlib.test_abc.Frozen_InspectLoaderDefaultsTests.test_get_source
+*test.test_importlib.test_abc.Frozen_InspectLoaderDefaultsTests.test_get_source
+*test.test_importlib.test_abc.Frozen_InspectLoaderDefaultsTests.test_is_package
 *test.test_importlib.test_abc.Frozen_InspectLoaderDefaultsTests.test_is_package
 *test.test_importlib.test_abc.Frozen_InspectLoaderGetCodeTests.test_get_code
 *test.test_importlib.test_abc.Frozen_InspectLoaderGetCodeTests.test_get_code_source_is_None
@@ -695,6 +697,8 @@
 *test.test_importlib.test_abc.Source_InspectLoader.test_subclasses
 *test.test_importlib.test_abc.Source_InspectLoader.test_superclasses
 *test.test_importlib.test_abc.Source_InspectLoaderDefaultsTests.test_get_source
+*test.test_importlib.test_abc.Source_InspectLoaderDefaultsTests.test_get_source
+*test.test_importlib.test_abc.Source_InspectLoaderDefaultsTests.test_is_package
 *test.test_importlib.test_abc.Source_InspectLoaderDefaultsTests.test_is_package
 *test.test_importlib.test_abc.Source_InspectLoaderGetCodeTests.test_get_code
 *test.test_importlib.test_abc.Source_InspectLoaderGetCodeTests.test_get_code_source_is_None
@@ -825,11 +829,32 @@
 *test.test_importlib.test_lazy.LazyLoaderTests.test_mutated_attr
 *test.test_importlib.test_lazy.LazyLoaderTests.test_mutated_preexisting_attr
 *test.test_importlib.test_lazy.LazyLoaderTests.test_new_attr
-*test.test_importlib.test_locks.Frozen_LifetimeTests.test_all_locks
-*test.test_importlib.test_locks.Frozen_LifetimeTests.test_lock_lifetime
+*test.test_importlib.test_locks.Frozen_DeadlockAvoidanceTests.test_deadlock
+*test.test_importlib.test_locks.Frozen_DeadlockAvoidanceTests.test_no_deadlock
+*test.test_importlib.test_locks.Frozen_ModuleLockAsRLockTests.test_acquire_contended
+*test.test_importlib.test_locks.Frozen_ModuleLockAsRLockTests.test_acquire_destroy
+*test.test_importlib.test_locks.Frozen_ModuleLockAsRLockTests.test_acquire_release
+*test.test_importlib.test_locks.Frozen_ModuleLockAsRLockTests.test_constructor
+*test.test_importlib.test_locks.Frozen_ModuleLockAsRLockTests.test_different_thread
+*test.test_importlib.test_locks.Frozen_ModuleLockAsRLockTests.test_reacquire
+*test.test_importlib.test_locks.Frozen_ModuleLockAsRLockTests.test_release_unacquired
+*test.test_importlib.test_locks.Frozen_ModuleLockAsRLockTests.test_thread_leak
+*test.test_importlib.test_locks.Frozen_ModuleLockAsRLockTests.test_weakref_deleted
+*test.test_importlib.test_locks.Frozen_ModuleLockAsRLockTests.test_weakref_exists
+*test.test_importlib.test_locks.Source_DeadlockAvoidanceTests.test_deadlock
+*test.test_importlib.test_locks.Source_DeadlockAvoidanceTests.test_no_deadlock
 *test.test_importlib.test_locks.Source_LifetimeTests.test_all_locks
 *test.test_importlib.test_locks.Source_LifetimeTests.test_lock_lifetime
-*test.test_importlib.test_locks.TestMain.test_main
+*test.test_importlib.test_locks.Source_ModuleLockAsRLockTests.test_acquire_contended
+*test.test_importlib.test_locks.Source_ModuleLockAsRLockTests.test_acquire_destroy
+*test.test_importlib.test_locks.Source_ModuleLockAsRLockTests.test_acquire_release
+*test.test_importlib.test_locks.Source_ModuleLockAsRLockTests.test_constructor
+*test.test_importlib.test_locks.Source_ModuleLockAsRLockTests.test_different_thread
+*test.test_importlib.test_locks.Source_ModuleLockAsRLockTests.test_reacquire
+*test.test_importlib.test_locks.Source_ModuleLockAsRLockTests.test_release_unacquired
+*test.test_importlib.test_locks.Source_ModuleLockAsRLockTests.test_thread_leak
+*test.test_importlib.test_locks.Source_ModuleLockAsRLockTests.test_weakref_deleted
+*test.test_importlib.test_locks.Source_ModuleLockAsRLockTests.test_weakref_exists
 *test.test_importlib.test_main.BasicTests.test_for_name_does_not_exist
 *test.test_importlib.test_main.BasicTests.test_new_style_classes
 *test.test_importlib.test_main.BasicTests.test_retrieves_version_of_self

graalpython/lib-python/3/importlib/_bootstrap_external.py

@@ -884,8 +884,7 @@ def get_code(self, fullname):
                     }
                     try:
                         flags = _classify_pyc(data, fullname, exc_details)
-                        # See issue GR-23189. Originally there is memoryview(data)[16:]
-                        bytes_data = data[16:]
+                        bytes_data = memoryview(data)[16:]
                         hash_based = flags & 0b1 != 0
                         if hash_based:
                             check_source = flags & 0b10 != 0

graalpython/lib-python/3/site.py

@@ -267,12 +267,12 @@ def _get_path(userbase):
     version = sys.version_info
 
     if os.name == 'nt':
-        return '%s\\Python%s%s\\site-packages' % (userbase, version[0], version[1])
+        return f'{userbase}\\Python{version[0]}{version[1]}\\site-packages'
 
     if sys.platform == 'darwin' and sys._framework:
-        return '%s/lib/python/site-packages' % version
+        return f'{userbase}/lib/python/site-packages'
 
-    return '%s/lib/python%s.%s/site-packages'% (userbase, version[0], version[1])
+    return f'{userbase}/lib/python{version[0]}.{version[1]}/site-packages'
 
 
 def getuserbase():
@@ -567,7 +567,6 @@ def main():
     known_paths = venv(known_paths)
     if ENABLE_USER_SITE is None:
         ENABLE_USER_SITE = check_enableusersite()
-
     known_paths = addusersitepackages(known_paths)
     known_paths = addsitepackages(known_paths)
     setquit()

graalpython/lib-python/3/sysconfig.py

@@ -1,8 +1,7 @@
 """Access to Python's configuration information."""
 
-import sys
-
 import os
+import sys
 from os.path import pardir, realpath
 
 __all__ = [

graalpython/lib-python/3/test/pickletester.py

@@ -1372,7 +1372,6 @@ def test_truncated_data(self):
         for p in badpickles:
             self.check_unpickling_error(self.truncated_errors, p)
 
-    @support.impl_detail("GR-16579: support for multi-threading", graalvm=False)
     @reap_threads
     def test_unpickle_module_race(self):
         # https://bugs.python.org/issue34572
@@ -3213,7 +3212,6 @@ def test_dumps_loads_oob_buffers(self):
     def test_dump_load_oob_buffers(self):
         # Test out-of-band buffers (PEP 574) with top-level dump() and load()
         def dumps(obj, **kwargs):
-            # breakpoint()
             f = io.BytesIO()
             self.dump(obj, f, **kwargs)
             return f.getvalue()

graalpython/lib-python/3/test/support/__init__.py

@@ -54,17 +54,15 @@
 except ImportError:
     gzip = None
 
-
 try:
     import bz2
 except ImportError:
     bz2 = None
 
-# TODO: Truffle reenable me once supported (GR-9149,GR-23309)
-# try:
-#     import lzma
-# except ImportError:
-lzma = None
+try:
+    import lzma
+except ImportError:
+    lzma = None
 
 try:
     import resource
@@ -2164,7 +2162,6 @@ def run_unittest(*classes):
 def _check_docstrings():
     """Just used to check if docstrings are enabled"""
 
-
 MISSING_C_DOCSTRINGS = (check_impl_detail() and
                         sys.platform != 'win32' and
                         not sysconfig.get_config_var('WITH_DOC_STRINGS'))

graalpython/lib-python/3/test/support/graalpython.py

@@ -29,9 +29,7 @@
     ndarray = None
 
 try:
-    # skipIfGraalPython(reason="not yet supported, causes SEGFAULT")
-    # import struct
-    struct = None
+    import struct
 except ImportError:
     struct = None
 
@@ -47,6 +45,7 @@
 except ImportError:
     numpy_array = None
 
+
 SHORT_TEST = True
 
 

graalpython/lib-python/3/test/test_buffer.py

@@ -1,6 +1,6 @@
 import datetime
 import unittest
-from test.support import cpython_only, impl_detail
+from test.support import cpython_only
 try:
     import _testcapi
 except ImportError:
@@ -492,7 +492,6 @@ def testfunction_kw(self, *, kw):
 
 class TestPEP590(unittest.TestCase):
 
-    @impl_detail("_testcapi missing", graalvm=False)
     def test_method_descriptor_flag(self):
         import functools
         cached = functools.lru_cache(1)(testfunction)
@@ -512,7 +511,6 @@ class MethodDescriptorHeap(_testcapi.MethodDescriptorBase):
             pass
         self.assertFalse(MethodDescriptorHeap.__flags__ & Py_TPFLAGS_METHOD_DESCRIPTOR)
 
-    @impl_detail("_testcapi missing", graalvm=False)
     def test_vectorcall_flag(self):
         self.assertTrue(_testcapi.MethodDescriptorBase.__flags__ & Py_TPFLAGS_HAVE_VECTORCALL)
         self.assertTrue(_testcapi.MethodDescriptorDerived.__flags__ & Py_TPFLAGS_HAVE_VECTORCALL)
@@ -524,7 +522,6 @@ class MethodDescriptorHeap(_testcapi.MethodDescriptorBase):
             pass
         self.assertFalse(MethodDescriptorHeap.__flags__ & Py_TPFLAGS_HAVE_VECTORCALL)
 
-    @impl_detail("_testcapi missing", graalvm=False)
     def test_vectorcall_override(self):
         # Check that tp_call can correctly override vectorcall.
         # MethodDescriptorNopGet implements tp_call but it inherits from
@@ -535,7 +532,6 @@ def test_vectorcall_override(self):
         f = _testcapi.MethodDescriptorNopGet()
         self.assertIs(f(*args), args)
 
-    @impl_detail("_testcapi missing", graalvm=False)
     def test_vectorcall(self):
         # Test a bunch of different ways to call objects:
         # 1. vectorcall using PyVectorcall_Call()