merge
diff --git a/Lib/imp.py b/Lib/imp.py
index d7ba344..655bf56 100644
--- a/Lib/imp.py
+++ b/Lib/imp.py
@@ -7,13 +7,14 @@
"""
# (Probably) need to stay in _imp
from _imp import (lock_held, acquire_lock, release_lock, reload,
- get_frozen_object, is_frozen_package, init_builtin,
- init_frozen, is_builtin, is_frozen, _fix_co_filename)
+ load_dynamic, get_frozen_object, is_frozen_package,
+ init_builtin, init_frozen, is_builtin, is_frozen,
+ _fix_co_filename)
# Can (probably) move to importlib
from _imp import (get_magic, get_tag, get_suffixes, cache_from_source,
source_from_cache)
# Should be re-implemented here (and mostly deprecated)
-from _imp import (find_module, load_module, load_compiled, load_dynamic,
+from _imp import (find_module, load_module, load_compiled,
load_package, load_source, NullImporter,
SEARCH_ERROR, PY_SOURCE, PY_COMPILED, C_EXTENSION,
PY_RESOURCE, PKG_DIRECTORY, C_BUILTIN, PY_FROZEN,
diff --git a/Python/freeze_importlib.py b/Python/freeze_importlib.py
index a069a0b..9cce0b1 100644
--- a/Python/freeze_importlib.py
+++ b/Python/freeze_importlib.py
@@ -24,6 +24,7 @@
lines.append('};\n')
with open(output_path, 'w') as output_file:
output_file.write('\n'.join(lines))
+ output_file.write('\u0000')
if __name__ == '__main__':
diff --git a/Python/importlib.h b/Python/importlib.h
index 6980231..f11dcbb 100644
--- a/Python/importlib.h
+++ b/Python/importlib.h
Binary files differ