Modules need to be under lib-graalpython/modules to be found by import

(cherry picked from commit 54b3063)

Author: eregon

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

@@ -105,13 +105,15 @@ def add_graalpython_core():
     l.append("polyglot.arrow : polyglot.arrow = " + os.path.join(lib_graalpython, "modules/_polyglot_arrow.py"))
     for name in [
         "modules/_sysconfigdata",
+        "modules/_polyglot",
+        "modules/_polyglot_datetime",
+        "modules/_polyglot_time",
     ]:
         modname = os.path.basename(name)
         modpath = os.path.join(lib_graalpython, f"{name}.py")
         l.append(f"{modname} : {modname} = {modpath}")
     for name in [
         "__graalpython__",
-        "_polyglot",
         "_sre",
         "_sysconfig",
         "_weakref",

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

@@ -218,8 +218,10 @@ private static final class Map {
         private static final PythonFrozenModule FROZEN_ONLY = new PythonFrozenModule("FROZEN_ONLY", null, false);
         private static final PythonFrozenModule POLYGLOT_ARROW = new PythonFrozenModule("POLYGLOT_ARROW", null, false);
         private static final PythonFrozenModule _SYSCONFIGDATA = new PythonFrozenModule("_SYSCONFIGDATA", null, false);
+        private static final PythonFrozenModule _POLYGLOT = new PythonFrozenModule("_POLYGLOT", null, false);
+        private static final PythonFrozenModule _POLYGLOT_DATETIME = new PythonFrozenModule("_POLYGLOT_DATETIME", null, false);
+        private static final PythonFrozenModule _POLYGLOT_TIME = new PythonFrozenModule("_POLYGLOT_TIME", null, false);
         private static final PythonFrozenModule GRAALPY___GRAALPYTHON__ = new PythonFrozenModule("GRAALPY___GRAALPYTHON__", null, false);
-        private static final PythonFrozenModule GRAALPY__POLYGLOT = new PythonFrozenModule("GRAALPY__POLYGLOT", null, false);
         private static final PythonFrozenModule GRAALPY__SRE = new PythonFrozenModule("GRAALPY__SRE", null, false);
         private static final PythonFrozenModule GRAALPY__SYSCONFIG = new PythonFrozenModule("GRAALPY__SYSCONFIG", null, false);
         private static final PythonFrozenModule GRAALPY__WEAKREF = new PythonFrozenModule("GRAALPY__WEAKREF", null, false);
@@ -596,10 +598,14 @@ public static final PythonFrozenModule lookup(String name) {
                 return Map.POLYGLOT_ARROW;
             case "_sysconfigdata":
                 return Map._SYSCONFIGDATA;
+            case "_polyglot":
+                return Map._POLYGLOT;
+            case "_polyglot_datetime":
+                return Map._POLYGLOT_DATETIME;
+            case "_polyglot_time":
+                return Map._POLYGLOT_TIME;
             case "graalpy.__graalpython__":
                 return Map.GRAALPY___GRAALPYTHON__;
-            case "graalpy._polyglot":
-                return Map.GRAALPY__POLYGLOT;
             case "graalpy._sre":
                 return Map.GRAALPY__SRE;
             case "graalpy._sysconfig":