summaryrefslogtreecommitdiffstats
path: root/Tools/freeze
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2014-03-30 19:07:25 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2014-03-30 19:07:25 (GMT)
commitc00d39e96aff698a8777120f9537e261c06be0ef (patch)
treecda5f37bb98e783d7006ec064b24b8d8968247ff /Tools/freeze
parent3a4340325b153eab1f1bb1b91882d777fe6bcb21 (diff)
downloadcpython-c00d39e96aff698a8777120f9537e261c06be0ef.zip
cpython-c00d39e96aff698a8777120f9537e261c06be0ef.tar.gz
cpython-c00d39e96aff698a8777120f9537e261c06be0ef.tar.bz2
Issue #16047: Fix module exception list and __file__ handling in freeze.
Patch by Meador Inge.
Diffstat (limited to 'Tools/freeze')
-rwxr-xr-xTools/freeze/freeze.py4
-rw-r--r--Tools/freeze/makeconfig.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/Tools/freeze/freeze.py b/Tools/freeze/freeze.py
index d0e3c3f..e0c6c2c 100755
--- a/Tools/freeze/freeze.py
+++ b/Tools/freeze/freeze.py
@@ -365,6 +365,10 @@ def main():
else:
mf.load_file(mod)
+ # Alias "importlib._bootstrap" to "_frozen_importlib" so that the
+ # import machinery can bootstrap.
+ mf.modules["_frozen_importlib"] = mf.modules["importlib._bootstrap"]
+
# Add the main script as either __main__, or the actual module name.
if python_entry_is_main:
mf.run_script(scriptfile)
diff --git a/Tools/freeze/makeconfig.py b/Tools/freeze/makeconfig.py
index 018992c..fabaace 100644
--- a/Tools/freeze/makeconfig.py
+++ b/Tools/freeze/makeconfig.py
@@ -3,7 +3,7 @@ import sys
# Write the config.c file
-never = ['marshal', 'imp', '_ast', '__main__', 'builtins',
+never = ['marshal', '_imp', '_ast', '__main__', 'builtins',
'sys', 'gc', '_warnings']
def makeconfig(infp, outfp, modules, with_ifdef=0):