__graalpython__ automatically wrap native methods if their truffle counterparts exist

Author: cosminbasca

graalpython/lib-graalpython/__graalpython__.py

@@ -92,9 +92,44 @@ def __getattr__(attr):
     owner_module.__dict__['__getattr__'] = __getattr__
 
 
+@builtin
+def auto_wrap_methods(delegate_name, delegate_attributes, owner_globals):
+    func_type = type(import_current_as_named_module)
+
+    new_globals = dict(**owner_globals)
+
+    for attr in owner_globals:
+        if attr.startswith("__"):
+            continue
+        elif not isinstance(owner_globals[attr], func_type):
+            continue
+        elif attr not in delegate_attributes:
+            raise AttributeError("attribute '{}' not allowed in module '{}', permitted values are: '{}'".format(
+                attr, __name__, delegate_attributes
+            ))
+
+        if attr in delegate_attributes:
+            def make_wrapper(attribute, method):
+                @__graalpython__.builtin
+                def wrapper(*args, **kwargs):
+                    try:
+                        return method(*args, **kwargs)
+                    except:
+                        delegate_module = __import__(delegate_name)
+                        return getattr(delegate_module, attribute)(*args, **kwargs)
+                return wrapper
+
+            new_globals[attr] = make_wrapper(attr, owner_globals[attr])
+
+    return new_globals
+
+
 @builtin
 def import_current_as_named_module_with_delegate(module_name, delegate_name, delegate_attributes=None,
-                                                 owner_globals=None):
+                                                 owner_globals=None, wrap_methods=True):
     owner_module = import_current_as_named_module(module_name, owner_globals=owner_globals)
+    if wrap_methods and owner_globals:
+        wrapped_globals = auto_wrap_methods(delegate_name, delegate_attributes, owner_globals)
+        owner_module.__dict__.update(**wrapped_globals)
     if delegate_attributes:
         lazy_attributes_from_delegate(delegate_name, delegate_attributes, owner_module)

graalpython/lib-graalpython/_struct.py

@@ -38,29 +38,9 @@
 # SOFTWARE.
 
 
-if "_truffle_pack" in globals():
-    @__graalpython__.builtin
-    def pack(fmt, *values):
-        try:
-            return _truffle_pack(fmt, *values)
-        except:
-            import _cpython_struct
-            return _cpython_struct.pack(fmt, *values)
-
-
-if "_truffle_unpack" in globals():
-    @__graalpython__.builtin
-    def unpack(fmt, buffer):
-        try:
-            return _truffle_unpack(fmt, buffer)
-        except:
-            import _cpython_struct
-            return _cpython_struct.unpack(fmt, buffer)
-
-
 __graalpython__.import_current_as_named_module_with_delegate(
     module_name="_struct",
     delegate_name="_cpython_struct",
-    delegate_attributes=['Struct', '_clearcache', 'calcsize', 'error', 'iter_unpack', 'pack', 'pack_into', 'unpack',
-                         'unpack_from'],
+    delegate_attributes=['Struct', 'StructError', '_clearcache', 'calcsize', 'error', 'iter_unpack', 'pack',
+                         'pack_into', 'unpack', 'unpack_from'],
     owner_globals=globals())