Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-45654: No need to freeze types (GH-30028)

This commit is contained in:
Christian Heimes 2021-12-10 20:09:09 +02:00 committed by GitHub
parent 3f398a77d3
commit 16638a4bdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/runpy.py
View File

@ -14,18 +14,20 @@ import sys
import importlib.machinery # importlib first so we can test #15386 via -m
import importlib.util
import io
import types
import os
__all__ = [
"run_module", "run_path",
]
# avoid 'import types' just for ModuleType
ModuleType = type(sys)
class _TempModule(object):
"""Temporarily replace a module in sys.modules with an empty namespace"""
def __init__(self, mod_name):
self.mod_name = mod_name
self.module = types.ModuleType(mod_name)
self.module = ModuleType(mod_name)
self._saved_module = []
def __enter__(self):

9
Makefile.pre.in
View File

@ -490,7 +490,6 @@ DEEPFREEZE_OBJS = \
Python/deepfreeze/os.o \
Python/deepfreeze/site.o \
Python/deepfreeze/stat.o \
Python/deepfreeze/types.o \
Python/deepfreeze/importlib.util.o \
Python/deepfreeze/importlib.machinery.o \
Python/deepfreeze/runpy.o \
@ -1014,9 +1013,6 @@ Python/deepfreeze/site.c: Python/frozen_modules/site.h $(DEEPFREEZE_DEPS)
Python/deepfreeze/stat.c: Python/frozen_modules/stat.h $(DEEPFREEZE_DEPS)
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/stat.h -m stat -o Python/deepfreeze/stat.c
Python/deepfreeze/types.c: Python/frozen_modules/types.h $(DEEPFREEZE_DEPS)
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/types.h -m types -o Python/deepfreeze/types.c
Python/deepfreeze/importlib.util.c: Python/frozen_modules/importlib.util.h $(DEEPFREEZE_DEPS)
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/importlib.util.h -m importlib.util -o Python/deepfreeze/importlib.util.c
@ -1065,7 +1061,6 @@ FROZEN_FILES_IN = \
Lib/os.py \
Lib/site.py \
Lib/stat.py \
Lib/types.py \
Lib/importlib/util.py \
Lib/importlib/machinery.py \
Lib/runpy.py \
@ -1091,7 +1086,6 @@ FROZEN_FILES_OUT = \
Python/frozen_modules/os.h \
Python/frozen_modules/site.h \
Python/frozen_modules/stat.h \
Python/frozen_modules/types.h \
Python/frozen_modules/importlib.util.h \
Python/frozen_modules/importlib.machinery.h \
Python/frozen_modules/runpy.h \
@ -1154,9 +1148,6 @@ Python/frozen_modules/site.h: $(FREEZE_MODULE) Lib/site.py
Python/frozen_modules/stat.h: $(FREEZE_MODULE) Lib/stat.py
$(FREEZE_MODULE) stat $(srcdir)/Lib/stat.py Python/frozen_modules/stat.h
Python/frozen_modules/types.h: $(FREEZE_MODULE) Lib/types.py
$(FREEZE_MODULE) types $(srcdir)/Lib/types.py Python/frozen_modules/types.h
Python/frozen_modules/importlib.util.h: $(FREEZE_MODULE) Lib/importlib/util.py
$(FREEZE_MODULE) importlib.util $(srcdir)/Lib/importlib/util.py Python/frozen_modules/importlib.util.h

7
PCbuild/_freeze_module.vcxproj
View File

@ -332,13 +332,6 @@
<DeepIntFile>$(IntDir)stat.g.c</DeepIntFile>
<DeepOutFile>$(PySourcePath)Python\deepfreeze\df.stat.c</DeepOutFile>
</None>
<None Include="..\Lib\types.py">
<ModName>types</ModName>
<IntFile>$(IntDir)types.g.h</IntFile>
<OutFile>$(PySourcePath)Python\frozen_modules\types.h</OutFile>
<DeepIntFile>$(IntDir)types.g.c</DeepIntFile>
<DeepOutFile>$(PySourcePath)Python\deepfreeze\df.types.c</DeepOutFile>
</None>
<None Include="..\Lib\importlib\util.py">
<ModName>importlib.util</ModName>
<IntFile>$(IntDir)importlib.util.g.h</IntFile>

3
PCbuild/_freeze_module.vcxproj.filters
View File

@ -447,9 +447,6 @@
<None Include="..\Lib\stat.py">
<Filter>Python Files</Filter>
</None>
<None Include="..\Lib\types.py">
<Filter>Python Files</Filter>
</None>
<None Include="..\Lib\importlib\util.py">
<Filter>Python Files</Filter>
</None>

1
PCbuild/pythoncore.vcxproj
View File

@ -541,7 +541,6 @@
<ClCompile Include="..\Python\deepfreeze\df.os.c" />
<ClCompile Include="..\Python\deepfreeze\df.site.c" />
<ClCompile Include="..\Python\deepfreeze\df.stat.c" />
<ClCompile Include="..\Python\deepfreeze\df.types.c" />
<ClCompile Include="..\Python\deepfreeze\df.importlib.util.c" />
<ClCompile Include="..\Python\deepfreeze\df.importlib.machinery.c" />
<ClCompile Include="..\Python\deepfreeze\df.runpy.c" />

3
Python/frozen.c
View File

@ -53,7 +53,6 @@
#include "frozen_modules/os.h"
#include "frozen_modules/site.h"
#include "frozen_modules/stat.h"
#include "frozen_modules/types.h"
#include "frozen_modules/importlib.util.h"
#include "frozen_modules/importlib.machinery.h"
#include "frozen_modules/runpy.h"
@ -83,7 +82,6 @@ extern PyObject *_Py_get_posixpath_toplevel(void);
extern PyObject *_Py_get_os_toplevel(void);
extern PyObject *_Py_get_site_toplevel(void);
extern PyObject *_Py_get_stat_toplevel(void);
extern PyObject *_Py_get_types_toplevel(void);
extern PyObject *_Py_get_importlib_util_toplevel(void);
extern PyObject *_Py_get_importlib_machinery_toplevel(void);
extern PyObject *_Py_get_runpy_toplevel(void);
@ -126,7 +124,6 @@ static const struct _frozen stdlib_modules[] = {
{"stat", _Py_M__stat, (int)sizeof(_Py_M__stat), GET_CODE(stat)},
/* runpy - run module with -m */
{"types", _Py_M__types, (int)sizeof(_Py_M__types), GET_CODE(types)},
{"importlib.util", _Py_M__importlib_util, (int)sizeof(_Py_M__importlib_util), GET_CODE(importlib_util)},
{"importlib.machinery", _Py_M__importlib_machinery, (int)sizeof(_Py_M__importlib_machinery), GET_CODE(importlib_machinery)},
{"runpy", _Py_M__runpy, (int)sizeof(_Py_M__runpy), GET_CODE(runpy)},

3
Tools/scripts/freeze_modules.py
View File

@ -69,10 +69,9 @@ FROZEN = [
'stat',
]),
('runpy - run module with -m', [
"types",
"importlib.util",
"importlib.machinery",
"runpy"
"runpy",
]),
(TESTS_SECTION, [
'__hello__',