diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2014-03-30 19:15:26 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2014-03-30 19:15:26 (GMT) |
| commit | 669b0950314d416d7d9d16284056e1934a30d2b8 (patch) | |
| tree | da3133b8642acd73c5068f367ca891abce0e7149 /Tools | |
| parent | ba6eba0850aba59b9968c1d4b465dbf8e6f2cdca (diff) | |
| parent | c00d39e96aff698a8777120f9537e261c06be0ef (diff) | |
| download | cpython-669b0950314d416d7d9d16284056e1934a30d2b8.zip cpython-669b0950314d416d7d9d16284056e1934a30d2b8.tar.gz cpython-669b0950314d416d7d9d16284056e1934a30d2b8.tar.bz2 | |
Merge 3.4 (#16047)
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/freeze/freeze.py | 4 | ||||
| -rw-r--r-- | Tools/freeze/makeconfig.py | 2 |
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): |