Skip to content

Commit

Permalink
pythongh-106789: avoid importing pprint from sysconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
iritkatriel committed Jul 15, 2023
1 parent e2ec0ba commit fe5fd51
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 20 deletions.
22 changes: 4 additions & 18 deletions Lib/opcode.py
Expand Up @@ -8,24 +8,10 @@
"haslocal", "hascompare", "hasfree", "hasexc", "opname", "opmap",
"HAVE_ARGUMENT", "EXTENDED_ARG"]

# It's a chicken-and-egg I'm afraid:
# We're imported before _opcode's made.
# With exception unheeded
# (stack_effect is not needed)
# Both our chickens and eggs are allayed.
# --Larry Hastings, 2013/11/23

try:
from _opcode import stack_effect
__all__.append('stack_effect')
except ImportError:
pass

# _opcode_metadata may not be ready during early stages of the build
try:
from _opcode_metadata import _specializations, _specialized_instructions
except ModuleNotFoundError:
pass
from _opcode import stack_effect
__all__.append('stack_effect')

from _opcode_metadata import _specializations, _specialized_instructions

cmp_op = ('<', '<=', '==', '!=', '>', '>=')

Expand Down
8 changes: 6 additions & 2 deletions Lib/sysconfig.py
Expand Up @@ -465,10 +465,14 @@ def _get_sysconfigdata_name():
f'_sysconfigdata_{sys.abiflags}_{sys.platform}_{multiarch}',
)

def _print_config_dict(d, stream):
print (" {", file=stream)
for k, v in sorted(d.items()):
print(f" {k!r}: {v!r},", file=stream)
print ("}", file=stream)

def _generate_posix_vars():
"""Generate the Python module containing build-time variables."""
import pprint
vars = {}
# load the installed Makefile:
makefile = get_makefile_filename()
Expand Down Expand Up @@ -523,7 +527,7 @@ def _generate_posix_vars():
f.write('# system configuration generated and used by'
' the sysconfig module\n')
f.write('build_time_vars = ')
pprint.pprint(vars, stream=f)
_print_config_dict(vars, stream=f)

# Create file used for sys.path fixup -- see Modules/getpath.c
with open('pybuilddir.txt', 'w', encoding='utf8') as f:
Expand Down

0 comments on commit fe5fd51

Please sign in to comment.