Skip to content

bpo-45653: partially freeze encodings package #29331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

bpo-45653: partially freeze encodings package #29331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,10 @@ FROZEN_FILES_IN = \
Lib/zipimport.py \
Lib/abc.py \
Lib/codecs.py \
Lib/encodings/__init__.py \
Lib/encodings/aliases.py \
Lib/encodings/ascii.py \
Lib/encodings/utf_8.py \
Lib/io.py \
Lib/_collections_abc.py \
Lib/_sitebuiltins.py \
Expand All @@ -771,6 +775,10 @@ FROZEN_FILES_OUT = \
Python/frozen_modules/zipimport.h \
Python/frozen_modules/abc.h \
Python/frozen_modules/codecs.h \
Python/frozen_modules/encodings.h \
Python/frozen_modules/encodings.aliases.h \
Python/frozen_modules/encodings.ascii.h \
Python/frozen_modules/encodings.utf_8.h \
Python/frozen_modules/io.h \
Python/frozen_modules/_collections_abc.h \
Python/frozen_modules/_sitebuiltins.h \
Expand Down Expand Up @@ -810,6 +818,18 @@ Python/frozen_modules/abc.h: Programs/_freeze_module Lib/abc.py
Python/frozen_modules/codecs.h: Programs/_freeze_module Lib/codecs.py
Programs/_freeze_module codecs $(srcdir)/Lib/codecs.py $(srcdir)/Python/frozen_modules/codecs.h

Python/frozen_modules/encodings.h: Programs/_freeze_module Lib/encodings/__init__.py
Programs/_freeze_module encodings $(srcdir)/Lib/encodings/__init__.py $(srcdir)/Python/frozen_modules/encodings.h

Python/frozen_modules/encodings.aliases.h: Programs/_freeze_module Lib/encodings/aliases.py
Programs/_freeze_module encodings.aliases $(srcdir)/Lib/encodings/aliases.py $(srcdir)/Python/frozen_modules/encodings.aliases.h

Python/frozen_modules/encodings.ascii.h: Programs/_freeze_module Lib/encodings/ascii.py
Programs/_freeze_module encodings.ascii $(srcdir)/Lib/encodings/ascii.py $(srcdir)/Python/frozen_modules/encodings.ascii.h

Python/frozen_modules/encodings.utf_8.h: Programs/_freeze_module Lib/encodings/utf_8.py
Programs/_freeze_module encodings.utf_8 $(srcdir)/Lib/encodings/utf_8.py $(srcdir)/Python/frozen_modules/encodings.utf_8.h

Python/frozen_modules/io.h: Programs/_freeze_module Lib/io.py
Programs/_freeze_module io $(srcdir)/Lib/io.py $(srcdir)/Python/frozen_modules/io.h

Expand Down
20 changes: 20 additions & 0 deletions PCbuild/_freeze_module.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,26 @@
<IntFile>$(IntDir)codecs.g.h</IntFile>
<OutFile>$(PySourcePath)Python\frozen_modules\codecs.h</OutFile>
</None>
<None Include="..\Lib\encodings\__init__.py">
<ModName>encodings</ModName>
<IntFile>$(IntDir)encodings.g.h</IntFile>
<OutFile>$(PySourcePath)Python\frozen_modules\encodings.h</OutFile>
</None>
<None Include="..\Lib\encodings\aliases.py">
<ModName>encodings.aliases</ModName>
<IntFile>$(IntDir)encodings.aliases.g.h</IntFile>
<OutFile>$(PySourcePath)Python\frozen_modules\encodings.aliases.h</OutFile>
</None>
<None Include="..\Lib\encodings\ascii.py">
<ModName>encodings.ascii</ModName>
<IntFile>$(IntDir)encodings.ascii.g.h</IntFile>
<OutFile>$(PySourcePath)Python\frozen_modules\encodings.ascii.h</OutFile>
</None>
<None Include="..\Lib\encodings\utf_8.py">
<ModName>encodings.utf_8</ModName>
<IntFile>$(IntDir)encodings.utf_8.g.h</IntFile>
<OutFile>$(PySourcePath)Python\frozen_modules\encodings.utf_8.h</OutFile>
</None>
<None Include="..\Lib\io.py">
<ModName>io</ModName>
<IntFile>$(IntDir)io.g.h</IntFile>
Expand Down
12 changes: 12 additions & 0 deletions PCbuild/_freeze_module.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,18 @@
<None Include="..\Lib\codecs.py">
<Filter>Python Files</Filter>
</None>
<None Include="..\Lib\encodings\__init__.py">
<Filter>Python Files</Filter>
</None>
<None Include="..\Lib\encodings\aliases.py">
<Filter>Python Files</Filter>
</None>
<None Include="..\Lib\encodings\ascii.py">
<Filter>Python Files</Filter>
</None>
<None Include="..\Lib\encodings\utf_8.py">
<Filter>Python Files</Filter>
</None>
<None Include="..\Lib\io.py">
<Filter>Python Files</Filter>
</None>
Expand Down
11 changes: 11 additions & 0 deletions Python/frozen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@
#include "frozen_modules/zipimport.h"
#include "frozen_modules/abc.h"
#include "frozen_modules/codecs.h"
#include "frozen_modules/encodings.h"
#include "frozen_modules/encodings.aliases.h"
#include "frozen_modules/encodings.ascii.h"
#include "frozen_modules/encodings.utf_8.h"
#include "frozen_modules/io.h"
#include "frozen_modules/_collections_abc.h"
#include "frozen_modules/_sitebuiltins.h"
Expand Down Expand Up @@ -75,6 +79,13 @@ static const struct _frozen stdlib_modules[] = {
/* stdlib - startup, without site (python -S) */
{"abc", _Py_M__abc, (int)sizeof(_Py_M__abc)},
{"codecs", _Py_M__codecs, (int)sizeof(_Py_M__codecs)},
{"encodings", _Py_M__encodings, -(int)sizeof(_Py_M__encodings)},
{"encodings.aliases", _Py_M__encodings_aliases,
(int)sizeof(_Py_M__encodings_aliases)},
{"encodings.ascii", _Py_M__encodings_ascii,
(int)sizeof(_Py_M__encodings_ascii)},
{"encodings.utf_8", _Py_M__encodings_utf_8,
(int)sizeof(_Py_M__encodings_utf_8)},
{"io", _Py_M__io, (int)sizeof(_Py_M__io)},

/* stdlib - startup, with site */
Expand Down
8 changes: 4 additions & 4 deletions Tools/scripts/freeze_modules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ def find_tool():
('stdlib - startup, without site (python -S)', [
'abc',
'codecs',
# For now we do not freeze the encodings, due # to the noise all
# those extra modules add to the text printed during the build.
# (See https://github.com/python/cpython/pull/28398#pullrequestreview-756856469.)
#'<encodings.*>',
'<encodings>',
'encodings.aliases',
'encodings.ascii',
'encodings.utf_8',
'io',
]),
('stdlib - startup, with site', [
Expand Down