Thanks to visit codestin.com
Credit goes to github.com

Skip to content

bpo-46712: Do not Regen Deep-Frozen Modules before Generating Global Objects #32061

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

Merged
merged 4 commits into from
Mar 23, 2022
Merged

bpo-46712: Do not Regen Deep-Frozen Modules before Generating Global Objects #32061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62e329d
Do not write to the file unless there are changes.
ericsnowcurrently Mar 22, 2022
32f618c
Run regen-deepfreeze manually instead of as a dependency.
ericsnowcurrently Mar 22, 2022
9e3be69
Add a docstring.
ericsnowcurrently Mar 22, 2022
e9010c0
Hide the comments.
ericsnowcurrently Mar 22, 2022
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
7 changes: 6 additions & 1 deletion Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,7 +1179,12 @@ regen-importlib: regen-frozen
# Global objects

.PHONY: regen-global-objects
regen-global-objects: regen-deepfreeze $(srcdir)/Tools/scripts/generate_global_objects.py
regen-global-objects: $(srcdir)/Tools/scripts/generate_global_objects.py
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/scripts/generate_global_objects.py
@# Run one more time after deepfreezing, to catch any globals added
@# there. This is necessary because the deep-frozen code isn't
@# commited to the repo.
$(MAKE) regen-deepfreeze
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/scripts/generate_global_objects.py

############################################################################
Expand Down
41 changes: 30 additions & 11 deletions Tools/scripts/generate_global_objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import contextlib
import glob
import io
import os.path
import re
import sys
Expand Down Expand Up @@ -123,6 +124,7 @@ def iter_global_strings():
varname, string = m.groups()
yield varname, string, filename, lno, line


def iter_to_marker(lines, marker):
for line in lines:
if line.rstrip() == marker:
Expand Down Expand Up @@ -165,6 +167,19 @@ def block(self, prefix, suffix="", *, continuation=None):
self.write("}" + suffix)


@contextlib.contextmanager
def open_for_changes(filename, orig):
"""Like open() but only write to the file if it changed."""
outfile = io.StringIO()
yield outfile
text = outfile.getvalue()
if text != orig:
with open(filename, 'w', encoding='utf-8') as outfile:
outfile.write(text)
else:
print(f'# not changed: {filename}')


#######################################
# the global objects

Expand All @@ -177,13 +192,15 @@ def generate_global_strings(identifiers, strings):

# Read the non-generated part of the file.
with open(filename) as infile:
before = ''.join(iter_to_marker(infile, START))[:-1]
for _ in iter_to_marker(infile, END):
pass
after = infile.read()[:-1]
orig = infile.read()
lines = iter(orig.rstrip().splitlines())
before = '\n'.join(iter_to_marker(lines, START))
for _ in iter_to_marker(lines, END):
pass
after = '\n'.join(lines)

# Generate the file.
with open(filename, 'w', encoding='utf-8') as outfile:
with open_for_changes(filename, orig) as outfile:
printer = Printer(outfile)
printer.write(before)
printer.write(START)
Expand All @@ -202,7 +219,6 @@ def generate_global_strings(identifiers, strings):
with printer.block('struct', ' latin1[128];'):
printer.write("PyCompactUnicodeObject _latin1;")
printer.write("uint8_t _data[2];")

printer.write(END)
printer.write(after)

Expand All @@ -227,13 +243,15 @@ def generate_runtime_init(identifiers, strings):

# Read the non-generated part of the file.
with open(filename) as infile:
before = ''.join(iter_to_marker(infile, START))[:-1]
for _ in iter_to_marker(infile, END):
pass
after = infile.read()[:-1]
orig = infile.read()
lines = iter(orig.rstrip().splitlines())
before = '\n'.join(iter_to_marker(lines, START))
for _ in iter_to_marker(lines, END):
pass
after = '\n'.join(lines)

# Generate the file.
with open(filename, 'w', encoding='utf-8') as outfile:
with open_for_changes(filename, orig) as outfile:
printer = Printer(outfile)
printer.write(before)
printer.write(START)
Expand Down Expand Up @@ -286,6 +304,7 @@ def get_identifiers_and_strings() -> 'tuple[set[str], dict[str, str]]':
raise ValueError(f'string mismatch for {name!r} ({string!r} != {strings[name]!r}')
return identifiers, strings


#######################################
# the script

Expand Down