Identify if the aliased module is a package or not.

Author: ericsnowcurrently

Lib/test/test_importlib/frozen/test_finder.py

@@ -95,7 +95,7 @@ def test_module(self):
             '__phello__.ham.__init__',
         ]
         for name in modules:
-            origname = name.rpartition('.')[0]
+            origname = '<' + name.rpartition('.')[0]
             filename = resolve_stdlib_file(name)
             with self.subTest(f'{name} -> {origname}'):
                 spec = self.find(name)

Python/frozen.c

@@ -113,9 +113,9 @@ static const struct _module_alias aliases[] = {
     {"__hello_alias__", "__hello__"},
     {"__phello_alias__", "__hello__"},
     {"__phello_alias__.spam", "__hello__"},
-    {"__phello__.__init__", "__phello__"},
-    {"__phello__.ham.__init__", "__phello__.ham"},
-    {"__hello_only__", ""},
+    {"__phello__.__init__", "<__phello__"},
+    {"__phello__.ham.__init__", "<__phello__.ham"},
+    {"__hello_only__", NULL},
     {0, 0} /* aliases sentinel */
 };
 const struct _module_alias *_PyImport_FrozenAliases = aliases;

Tools/scripts/freeze_modules.py

@@ -274,6 +274,15 @@ def symbol(self):
         name = self.frozenid.replace('.', '_')
         return '_Py_M__' + name
 
+    @property
+    def ispkg(self):
+        if not self.pyfile:
+            return False
+        elif self.frozenid.endswith('.__init__'):
+            return False
+        else:
+            return os.path.basename(self.pyfile) == '__init__.py'
+
 
 def resolve_frozen_file(frozenid, destdir=MODULES_DIR):
     """Return the filename corresponding to the given frozen ID.
@@ -541,7 +550,12 @@ def regen_frozen(modules):
             deflines.append(indent + line2)
 
         if mod.isalias:
-            entry = '{"%s", "%s"},' % (mod.name, mod.orig or "")
+            if not mod.orig:
+                entry = '{"%s", NULL},' % (mod.name,)
+            elif mod.source.ispkg:
+                entry = '{"%s", "<%s"},' % (mod.name, mod.orig)
+            else:
+                entry = '{"%s", "%s"},' % (mod.name, mod.orig)
             aliaslines.append(indent + entry)
 
     if not deflines[0]: