summaryrefslogtreecommitdiffstats
path: root/Programs
diff options
context:
space:
mode:
authorEric Snow <ericsnowcurrently@gmail.com>2021-10-05 17:26:37 (GMT)
committerGitHub <noreply@github.com>2021-10-05 17:26:37 (GMT)
commit08285d563e64c179a56ab2f952345b3dbcdb54f3 (patch)
tree7bc95d1865dcb6c29f835044e678fd9ebbe85904 /Programs
parent444429142c88b7e22117a6e14c95d1fbdd638c60 (diff)
downloadcpython-08285d563e64c179a56ab2f952345b3dbcdb54f3.zip
cpython-08285d563e64c179a56ab2f952345b3dbcdb54f3.tar.gz
cpython-08285d563e64c179a56ab2f952345b3dbcdb54f3.tar.bz2
bpo-45020: Identify which frozen modules are actually aliases. (gh-28655)
In the list of generated frozen modules at the top of Tools/scripts/freeze_modules.py, you will find that some of the modules have a different name than the module (or .py file) that is actually frozen. Let's call each case an "alias". Aliases do not come into play until we get to the (generated) list of modules in Python/frozen.c. (The tool for freezing modules, Programs/_freeze_module, is only concerned with the source file, not the module it will be used for.) Knowledge of which frozen modules are aliases (and the identity of the original module) normally isn't important. However, this information is valuable when we go to set __file__ on frozen stdlib modules. This change updates Tools/scripts/freeze_modules.py to map aliases to the original module name (or None if not a stdlib module) in Python/frozen.c. We also add a helper function in Python/import.c to look up a frozen module's alias and add the result of that function to the frozen info returned from find_frozen(). https://bugs.python.org/issue45020
Diffstat (limited to 'Programs')
-rw-r--r--Programs/_freeze_module.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/Programs/_freeze_module.c b/Programs/_freeze_module.c
index 4b0633e..dd90d92 100644
--- a/Programs/_freeze_module.c
+++ b/Programs/_freeze_module.c
@@ -9,6 +9,7 @@
#include <Python.h>
#include <marshal.h>
+#include <pycore_import.h>
#include <stdio.h>
#include <sys/types.h>
@@ -24,8 +25,12 @@
static const struct _frozen _PyImport_FrozenModules[] = {
{0, 0, 0} /* sentinel */
};
+static const struct _module_alias aliases[] = {
+ {0, 0} /* sentinel */
+};
const struct _frozen *PyImport_FrozenModules;
+const struct _module_alias *_PyImport_FrozenAliases;
static const char header[] =
"/* Auto-generated by Programs/_freeze_module.c */";
@@ -183,6 +188,7 @@ main(int argc, char *argv[])
const char *name, *inpath, *outpath;
PyImport_FrozenModules = _PyImport_FrozenModules;
+ _PyImport_FrozenAliases = aliases;
if (argc != 4) {
fprintf(stderr, "need to specify the name, input and output paths\n");