Skip to content

Commit 07a39ca

Browse files
encukouencukou
authored
gh-145278: Revert "freeze encodings (partially) and linecache (#145279)" (#145689)
1 parent 255e79f commit 07a39ca

6 files changed

Lines changed: 4 additions & 72 deletions

File tree

‎Makefile.pre.in‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1729,9 +1729,6 @@ FROZEN_FILES_IN = \
17291729
Lib/zipimport.py \
17301730
Lib/abc.py \
17311731
Lib/codecs.py \
1732-
Lib/encodings/__init__.py \
1733-
Lib/encodings/aliases.py \
1734-
Lib/encodings/utf_8.py \
17351732
Lib/io.py \
17361733
Lib/_collections_abc.py \
17371734
Lib/_sitebuiltins.py \
@@ -1741,7 +1738,6 @@ FROZEN_FILES_IN = \
17411738
Lib/os.py \
17421739
Lib/site.py \
17431740
Lib/stat.py \
1744-
Lib/linecache.py \
17451741
Lib/importlib/util.py \
17461742
Lib/importlib/machinery.py \
17471743
Lib/runpy.py \
@@ -1758,9 +1754,6 @@ FROZEN_FILES_OUT = \
17581754
Python/frozen_modules/zipimport.h \
17591755
Python/frozen_modules/abc.h \
17601756
Python/frozen_modules/codecs.h \
1761-
Python/frozen_modules/encodings.h \
1762-
Python/frozen_modules/encodings.aliases.h \
1763-
Python/frozen_modules/encodings.utf_8.h \
17641757
Python/frozen_modules/io.h \
17651758
Python/frozen_modules/_collections_abc.h \
17661759
Python/frozen_modules/_sitebuiltins.h \
@@ -1770,7 +1763,6 @@ FROZEN_FILES_OUT = \
17701763
Python/frozen_modules/os.h \
17711764
Python/frozen_modules/site.h \
17721765
Python/frozen_modules/stat.h \
1773-
Python/frozen_modules/linecache.h \
17741766
Python/frozen_modules/importlib.util.h \
17751767
Python/frozen_modules/importlib.machinery.h \
17761768
Python/frozen_modules/runpy.h \
@@ -1810,15 +1802,6 @@ Python/frozen_modules/abc.h: Lib/abc.py $(FREEZE_MODULE_DEPS)
18101802
Python/frozen_modules/codecs.h: Lib/codecs.py $(FREEZE_MODULE_DEPS)
18111803
$(FREEZE_MODULE) codecs $(srcdir)/Lib/codecs.py Python/frozen_modules/codecs.h
18121804

1813-
Python/frozen_modules/encodings.h: Lib/encodings/__init__.py $(FREEZE_MODULE_DEPS)
1814-
$(FREEZE_MODULE) encodings $(srcdir)/Lib/encodings/__init__.py Python/frozen_modules/encodings.h
1815-
1816-
Python/frozen_modules/encodings.aliases.h: Lib/encodings/aliases.py $(FREEZE_MODULE_DEPS)
1817-
$(FREEZE_MODULE) encodings.aliases $(srcdir)/Lib/encodings/aliases.py Python/frozen_modules/encodings.aliases.h
1818-
1819-
Python/frozen_modules/encodings.utf_8.h: Lib/encodings/utf_8.py $(FREEZE_MODULE_DEPS)
1820-
$(FREEZE_MODULE) encodings.utf_8 $(srcdir)/Lib/encodings/utf_8.py Python/frozen_modules/encodings.utf_8.h
1821-
18221805
Python/frozen_modules/io.h: Lib/io.py $(FREEZE_MODULE_DEPS)
18231806
$(FREEZE_MODULE) io $(srcdir)/Lib/io.py Python/frozen_modules/io.h
18241807

@@ -1846,9 +1829,6 @@ Python/frozen_modules/site.h: Lib/site.py $(FREEZE_MODULE_DEPS)
18461829
Python/frozen_modules/stat.h: Lib/stat.py $(FREEZE_MODULE_DEPS)
18471830
$(FREEZE_MODULE) stat $(srcdir)/Lib/stat.py Python/frozen_modules/stat.h
18481831

1849-
Python/frozen_modules/linecache.h: Lib/linecache.py $(FREEZE_MODULE_DEPS)
1850-
$(FREEZE_MODULE) linecache $(srcdir)/Lib/linecache.py Python/frozen_modules/linecache.h
1851-
18521832
Python/frozen_modules/importlib.util.h: Lib/importlib/util.py $(FREEZE_MODULE_DEPS)
18531833
$(FREEZE_MODULE) importlib.util $(srcdir)/Lib/importlib/util.py Python/frozen_modules/importlib.util.h
18541834

‎Misc/NEWS.d/next/Core_and_Builtins/2026-02-26-21-22-34.gh-issue-145278.DHkYqt.rst‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎PCbuild/_freeze_module.vcxproj‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -310,21 +310,6 @@
310310
<IntFile>$(IntDir)codecs.g.h</IntFile>
311311
<OutFile>$(GeneratedFrozenModulesDir)Python\frozen_modules\codecs.h</OutFile>
312312
</None>
313-
<None Include="..\Lib\encodings\__init__.py">
314-
<ModName>encodings</ModName>
315-
<IntFile>$(IntDir)encodings.g.h</IntFile>
316-
<OutFile>$(GeneratedFrozenModulesDir)Python\frozen_modules\encodings.h</OutFile>
317-
</None>
318-
<None Include="..\Lib\encodings\aliases.py">
319-
<ModName>encodings.aliases</ModName>
320-
<IntFile>$(IntDir)encodings.aliases.g.h</IntFile>
321-
<OutFile>$(GeneratedFrozenModulesDir)Python\frozen_modules\encodings.aliases.h</OutFile>
322-
</None>
323-
<None Include="..\Lib\encodings\utf_8.py">
324-
<ModName>encodings.utf_8</ModName>
325-
<IntFile>$(IntDir)encodings.utf_8.g.h</IntFile>
326-
<OutFile>$(GeneratedFrozenModulesDir)Python\frozen_modules\encodings.utf_8.h</OutFile>
327-
</None>
328313
<None Include="..\Lib\io.py">
329314
<ModName>io</ModName>
330315
<IntFile>$(IntDir)io.g.h</IntFile>
@@ -370,11 +355,6 @@
370355
<IntFile>$(IntDir)stat.g.h</IntFile>
371356
<OutFile>$(GeneratedFrozenModulesDir)Python\frozen_modules\stat.h</OutFile>
372357
</None>
373-
<None Include="..\Lib\linecache.py">
374-
<ModName>linecache</ModName>
375-
<IntFile>$(IntDir)linecache.g.h</IntFile>
376-
<OutFile>$(GeneratedFrozenModulesDir)Python\frozen_modules\linecache.h</OutFile>
377-
</None>
378358
<None Include="..\Lib\importlib\util.py">
379359
<ModName>importlib.util</ModName>
380360
<IntFile>$(IntDir)importlib.util.g.h</IntFile>

‎PCbuild/_freeze_module.vcxproj.filters‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -537,15 +537,6 @@
537537
<None Include="..\Lib\codecs.py">
538538
<Filter>Python Files</Filter>
539539
</None>
540-
<None Include="..\Lib\encodings\__init__.py">
541-
<Filter>Python Files</Filter>
542-
</None>
543-
<None Include="..\Lib\encodings\aliases.py">
544-
<Filter>Python Files</Filter>
545-
</None>
546-
<None Include="..\Lib\encodings\utf_8.py">
547-
<Filter>Python Files</Filter>
548-
</None>
549540
<None Include="..\Lib\io.py">
550541
<Filter>Python Files</Filter>
551542
</None>
@@ -573,9 +564,6 @@
573564
<None Include="..\Lib\stat.py">
574565
<Filter>Python Files</Filter>
575566
</None>
576-
<None Include="..\Lib\linecache.py">
577-
<Filter>Python Files</Filter>
578-
</None>
579567
<None Include="..\Lib\importlib\util.py">
580568
<Filter>Python Files</Filter>
581569
</None>

‎Python/frozen.c‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@
4646
#include "frozen_modules/zipimport.h"
4747
#include "frozen_modules/abc.h"
4848
#include "frozen_modules/codecs.h"
49-
#include "frozen_modules/encodings.h"
50-
#include "frozen_modules/encodings.aliases.h"
51-
#include "frozen_modules/encodings.utf_8.h"
5249
#include "frozen_modules/io.h"
5350
#include "frozen_modules/_collections_abc.h"
5451
#include "frozen_modules/_sitebuiltins.h"
@@ -58,7 +55,6 @@
5855
#include "frozen_modules/os.h"
5956
#include "frozen_modules/site.h"
6057
#include "frozen_modules/stat.h"
61-
#include "frozen_modules/linecache.h"
6258
#include "frozen_modules/importlib.util.h"
6359
#include "frozen_modules/importlib.machinery.h"
6460
#include "frozen_modules/runpy.h"
@@ -80,9 +76,6 @@ static const struct _frozen stdlib_modules[] = {
8076
/* stdlib - startup, without site (python -S) */
8177
{"abc", _Py_M__abc, (int)sizeof(_Py_M__abc), false},
8278
{"codecs", _Py_M__codecs, (int)sizeof(_Py_M__codecs), false},
83-
{"encodings", _Py_M__encodings, (int)sizeof(_Py_M__encodings), true},
84-
{"encodings.aliases", _Py_M__encodings_aliases, (int)sizeof(_Py_M__encodings_aliases), false},
85-
{"encodings.utf_8", _Py_M__encodings_utf_8, (int)sizeof(_Py_M__encodings_utf_8), false},
8679
{"io", _Py_M__io, (int)sizeof(_Py_M__io), false},
8780

8881
/* stdlib - startup, with site */
@@ -95,9 +88,6 @@ static const struct _frozen stdlib_modules[] = {
9588
{"site", _Py_M__site, (int)sizeof(_Py_M__site), false},
9689
{"stat", _Py_M__stat, (int)sizeof(_Py_M__stat), false},
9790

98-
/* pythonrun - interactive */
99-
{"linecache", _Py_M__linecache, (int)sizeof(_Py_M__linecache), false},
100-
10191
/* runpy - run module with -m */
10292
{"importlib.util", _Py_M__importlib_util, (int)sizeof(_Py_M__importlib_util), false},
10393
{"importlib.machinery", _Py_M__importlib_machinery, (int)sizeof(_Py_M__importlib_machinery), false},

‎Tools/build/freeze_modules.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@
5050
('stdlib - startup, without site (python -S)', [
5151
'abc',
5252
'codecs',
53-
'<encodings>',
54-
'encodings.aliases',
55-
'encodings.utf_8',
53+
# For now we do not freeze the encodings, due # to the noise all
54+
# those extra modules add to the text printed during the build.
55+
# (See https://github.com/python/cpython/pull/28398#pullrequestreview-756856469.)
56+
#'<encodings.*>',
5657
'io',
5758
]),
5859
('stdlib - startup, with site', [
@@ -65,9 +66,6 @@
6566
'site',
6667
'stat',
6768
]),
68-
('pythonrun - interactive', [
69-
'linecache',
70-
]),
7169
('runpy - run module with -m', [
7270
"importlib.util",
7371
"importlib.machinery",

0 commit comments

Comments
 (0)