Intrinsify the remainder of unicodedata module

Author: msimacek

graalpython/com.oracle.graal.python.frozen/freeze_modules.py

@@ -125,7 +125,6 @@ def add_graalpython_core():
         "_weakref",
         "java",
         "pip_hook",
-        "unicodedata",
         "_nt",
     ]:
         modname = f"graalpy.{os.path.basename(name)}"

graalpython/com.oracle.graal.python.test/src/tests/test_startup.py

@@ -49,7 +49,6 @@
     '_frozen_importlib_external',
     '__graalpython__',
     '_weakref',
-    'unicodedata',
     '_sre',
     '_sysconfig',
     'java',

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -32,7 +32,6 @@
 import static com.oracle.graal.python.nodes.BuiltinNames.T_NT;
 import static com.oracle.graal.python.nodes.BuiltinNames.T_STDERR;
 import static com.oracle.graal.python.nodes.BuiltinNames.T_SYS;
-import static com.oracle.graal.python.nodes.BuiltinNames.T_UNICODEDATA;
 import static com.oracle.graal.python.nodes.BuiltinNames.T_ZIPIMPORT;
 import static com.oracle.graal.python.nodes.BuiltinNames.T__SRE;
 import static com.oracle.graal.python.nodes.BuiltinNames.T__SYSCONFIG;
@@ -428,7 +427,6 @@ private static TruffleString[] getCoreFiles() {
         List<TruffleString> coreFiles = List.of(
                         T___GRAALPYTHON__,
                         T__WEAKREF,
-                        T_UNICODEDATA,
                         T__SRE,
                         T__SYSCONFIG,
                         T_JAVA,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/UnicodeDataModuleBuiltins.java

@@ -42,6 +42,7 @@
 
 import static com.oracle.graal.python.nodes.BuiltinNames.J_UNICODEDATA;
 import static com.oracle.graal.python.nodes.BuiltinNames.T_UNICODEDATA;
+import static com.oracle.graal.python.nodes.BuiltinNames.T___GRAALPYTHON__;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.KeyError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.ValueError;
 import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
@@ -62,12 +63,15 @@
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
+import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryClinicBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryClinicBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentClinicProvider;
+import com.oracle.graal.python.nodes.object.GetOrCreateDictNode;
+import com.oracle.graal.python.runtime.object.PFactory;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
@@ -117,6 +121,11 @@ public void postInitialize(Python3Core core) {
         super.postInitialize(core);
         PythonModule self = core.lookupBuiltinModule(T_UNICODEDATA);
         self.setAttribute(toTruffleStringUncached("unidata_version"), toTruffleStringUncached(getUnicodeVersion()));
+        PyObjectCallMethodObjArgs.executeUncached(core.lookupBuiltinModule(T___GRAALPYTHON__), toTruffleStringUncached("import_current_as_named_module_with_delegate"),
+                        /* module_name= */ T_UNICODEDATA,
+                        /* delegate_name= */ toTruffleStringUncached("_cpython_unicodedata"),
+                        /* delegate_attributes= */ PFactory.createList(core.getLanguage(), new Object[]{toTruffleStringUncached("ucd_3_2_0")}),
+                        /* owner_globals= */ GetOrCreateDictNode.executeUncached(self));
     }
 
     static final int NORMALIZER_FORM_COUNT = 4;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/module/FrozenModules.java

@@ -105,7 +105,6 @@ private static final class Map {
         private static final PythonFrozenModule GRAALPY__WEAKREF = new PythonFrozenModule("GRAALPY__WEAKREF", null, false);
         private static final PythonFrozenModule GRAALPY_JAVA = new PythonFrozenModule("GRAALPY_JAVA", null, false);
         private static final PythonFrozenModule GRAALPY_PIP_HOOK = new PythonFrozenModule("GRAALPY_PIP_HOOK", null, false);
-        private static final PythonFrozenModule GRAALPY_UNICODEDATA = new PythonFrozenModule("GRAALPY_UNICODEDATA", null, false);
         private static final PythonFrozenModule GRAALPY__NT = new PythonFrozenModule("GRAALPY__NT", null, false);
     }
 
@@ -243,8 +242,6 @@ public static final PythonFrozenModule lookup(String name) {
                 return Map.GRAALPY_JAVA;
             case "graalpy.pip_hook":
                 return Map.GRAALPY_PIP_HOOK;
-            case "graalpy.unicodedata":
-                return Map.GRAALPY_UNICODEDATA;
             case "graalpy._nt":
                 return Map.GRAALPY__NT;
             default:

graalpython/lib-graalpython/__graalpython__.py

@@ -62,7 +62,7 @@ def import_current_as_named_module(module, name, owner_globals=None):
 
 
 @builtin
-def lazy_attributes_from_delegate(module, delegate_name, attributes, owner_module, on_import_error):
+def lazy_attributes_from_delegate(module, delegate_name, attributes, owner_module):
     """
     used to lazily load attributes defined in another module via the __getattr__ mechanism.
     This will only cache the attributes in the caller module.
@@ -76,14 +76,7 @@ def lazy_attributes_from_delegate(module, delegate_name, attributes, owner_modul
 
     def __getattr__(attr):
         if attr in attributes:
-            try:
-                delegate_module = __import__(delegate_name)
-            except ImportError:
-                if on_import_error and (attr in on_import_error):
-                    return on_import_error[attr]
-                else:
-                    raise
-
+            delegate_module = __import__(delegate_name)
             new_globals = dict(**delegate_module.__dict__)
             new_globals = { key: new_globals[key] for key in attributes }
             new_globals.update(**owner_module.__dict__)
@@ -99,46 +92,9 @@ def __getattr__(attr):
 
 
 @builtin
-def auto_wrap_methods(module, 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(module, *args, **kwargs):
-                    try:
-                        return method(*args, **kwargs)
-                    except NotImplementedError:
-                        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, module_name, delegate_name, delegate_attributes=None,
-                                                 owner_globals=None, wrap_methods=True, on_import_error=None):
+def import_current_as_named_module_with_delegate(module, module_name, delegate_name, delegate_attributes, owner_globals=None):
     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, on_import_error)
+    lazy_attributes_from_delegate(delegate_name, delegate_attributes, owner_module)
 
 
 @builtin