From fd08faeeb3a6dd9d36056ab19cd82e583d93a7f4 Mon Sep 17 00:00:00 2001 From: Eric Snow Date: Tue, 1 Mar 2022 10:21:03 -0700 Subject: [PATCH 1/3] Let generate_global_objects.py run on earlier Python versions. --- Include/internal/pycore_global_strings.h | 68 ++++++++++++++++++++++++ Include/internal/pycore_runtime_init.h | 68 ++++++++++++++++++++++++ Tools/scripts/generate_global_objects.py | 2 +- 3 files changed, 137 insertions(+), 1 deletion(-) diff --git a/Include/internal/pycore_global_strings.h b/Include/internal/pycore_global_strings.h index 2a42dc16ce1b55..2b82a7d09e18da 100644 --- a/Include/internal/pycore_global_strings.h +++ b/Include/internal/pycore_global_strings.h @@ -222,11 +222,20 @@ struct _Py_global_strings { STRUCT_FOR_ID(_uninitialized_submodules) STRUCT_FOR_ID(_warn_unawaited_coroutine) STRUCT_FOR_ID(_xoptions) + STRUCT_FOR_ID(a) + STRUCT_FOR_ID(access) STRUCT_FOR_ID(add) STRUCT_FOR_ID(append) + STRUCT_FOR_ID(argv) + STRUCT_FOR_ID(b) + STRUCT_FOR_ID(base) STRUCT_FOR_ID(big) STRUCT_FOR_ID(buffer) + STRUCT_FOR_ID(buffering) + STRUCT_FOR_ID(bufsize) STRUCT_FOR_ID(builtins) + STRUCT_FOR_ID(byteorder) + STRUCT_FOR_ID(bytes) STRUCT_FOR_ID(c_call) STRUCT_FOR_ID(c_exception) STRUCT_FOR_ID(c_return) @@ -235,79 +244,121 @@ struct _Py_global_strings { STRUCT_FOR_ID(close) STRUCT_FOR_ID(closed) STRUCT_FOR_ID(code) + STRUCT_FOR_ID(cookie) STRUCT_FOR_ID(copy) STRUCT_FOR_ID(copyreg) + STRUCT_FOR_ID(count) + STRUCT_FOR_ID(cwd) + STRUCT_FOR_ID(data) STRUCT_FOR_ID(decode) + STRUCT_FOR_ID(decoder) STRUCT_FOR_ID(default) STRUCT_FOR_ID(defaultaction) + STRUCT_FOR_ID(dict) STRUCT_FOR_ID(dictcomp) STRUCT_FOR_ID(difference_update) + STRUCT_FOR_ID(dir_fd) STRUCT_FOR_ID(dispatch_table) STRUCT_FOR_ID(displayhook) + STRUCT_FOR_ID(dont_inherit) STRUCT_FOR_ID(enable) STRUCT_FOR_ID(encode) STRUCT_FOR_ID(encoding) + STRUCT_FOR_ID(end) STRUCT_FOR_ID(end_lineno) STRUCT_FOR_ID(end_offset) + STRUCT_FOR_ID(env) STRUCT_FOR_ID(errors) + STRUCT_FOR_ID(exc_type) + STRUCT_FOR_ID(exc_value) STRUCT_FOR_ID(excepthook) STRUCT_FOR_ID(exception) STRUCT_FOR_ID(extend) + STRUCT_FOR_ID(factory) + STRUCT_FOR_ID(fd) + STRUCT_FOR_ID(file) STRUCT_FOR_ID(filename) STRUCT_FOR_ID(fileno) + STRUCT_FOR_ID(filepath) STRUCT_FOR_ID(fillvalue) STRUCT_FOR_ID(filters) + STRUCT_FOR_ID(final) STRUCT_FOR_ID(find_class) + STRUCT_FOR_ID(flags) STRUCT_FOR_ID(flush) + STRUCT_FOR_ID(follow_symlinks) + STRUCT_FOR_ID(format) + STRUCT_FOR_ID(func) STRUCT_FOR_ID(genexpr) STRUCT_FOR_ID(get) STRUCT_FOR_ID(get_source) STRUCT_FOR_ID(getattr) STRUCT_FOR_ID(getstate) + STRUCT_FOR_ID(globals) + STRUCT_FOR_ID(hook) + STRUCT_FOR_ID(id) STRUCT_FOR_ID(ignore) STRUCT_FOR_ID(importlib) STRUCT_FOR_ID(inf) + STRUCT_FOR_ID(input) STRUCT_FOR_ID(intersection) STRUCT_FOR_ID(isatty) + STRUCT_FOR_ID(item) STRUCT_FOR_ID(items) STRUCT_FOR_ID(iter) STRUCT_FOR_ID(join) + STRUCT_FOR_ID(keepends) + STRUCT_FOR_ID(key) STRUCT_FOR_ID(keys) STRUCT_FOR_ID(lambda) STRUCT_FOR_ID(last_traceback) STRUCT_FOR_ID(last_type) STRUCT_FOR_ID(last_value) STRUCT_FOR_ID(latin1) + STRUCT_FOR_ID(level) STRUCT_FOR_ID(line) STRUCT_FOR_ID(lineno) STRUCT_FOR_ID(listcomp) STRUCT_FOR_ID(little) STRUCT_FOR_ID(locale) + STRUCT_FOR_ID(mapping) STRUCT_FOR_ID(match) + STRUCT_FOR_ID(message) STRUCT_FOR_ID(metaclass) + STRUCT_FOR_ID(method) + STRUCT_FOR_ID(mod) STRUCT_FOR_ID(mode) STRUCT_FOR_ID(modules) STRUCT_FOR_ID(mro) STRUCT_FOR_ID(msg) + STRUCT_FOR_ID(n) STRUCT_FOR_ID(n_fields) STRUCT_FOR_ID(n_sequence_fields) STRUCT_FOR_ID(n_unnamed_fields) STRUCT_FOR_ID(name) STRUCT_FOR_ID(newlines) + STRUCT_FOR_ID(ns) STRUCT_FOR_ID(obj) + STRUCT_FOR_ID(object) STRUCT_FOR_ID(offset) STRUCT_FOR_ID(onceregistry) STRUCT_FOR_ID(opcode) STRUCT_FOR_ID(open) + STRUCT_FOR_ID(optimize) + STRUCT_FOR_ID(owner) + STRUCT_FOR_ID(p) STRUCT_FOR_ID(parent) STRUCT_FOR_ID(partial) STRUCT_FOR_ID(path) STRUCT_FOR_ID(peek) STRUCT_FOR_ID(persistent_id) STRUCT_FOR_ID(persistent_load) + STRUCT_FOR_ID(pid) + STRUCT_FOR_ID(pos) STRUCT_FOR_ID(print_file_and_line) STRUCT_FOR_ID(ps1) STRUCT_FOR_ID(ps2) + STRUCT_FOR_ID(r) STRUCT_FOR_ID(raw) STRUCT_FOR_ID(read) STRUCT_FOR_ID(read1) @@ -321,31 +372,48 @@ struct _Py_global_strings { STRUCT_FOR_ID(replace) STRUCT_FOR_ID(reset) STRUCT_FOR_ID(return) + STRUCT_FOR_ID(reverse) STRUCT_FOR_ID(reversed) + STRUCT_FOR_ID(s) STRUCT_FOR_ID(seek) STRUCT_FOR_ID(seekable) STRUCT_FOR_ID(send) + STRUCT_FOR_ID(sep) STRUCT_FOR_ID(setcomp) STRUCT_FOR_ID(setstate) + STRUCT_FOR_ID(size) + STRUCT_FOR_ID(sizehint) STRUCT_FOR_ID(sort) + STRUCT_FOR_ID(source) + STRUCT_FOR_ID(stacklevel) + STRUCT_FOR_ID(start) STRUCT_FOR_ID(stderr) STRUCT_FOR_ID(stdin) STRUCT_FOR_ID(stdout) STRUCT_FOR_ID(strict) + STRUCT_FOR_ID(string) STRUCT_FOR_ID(symmetric_difference_update) + STRUCT_FOR_ID(tag) + STRUCT_FOR_ID(target) STRUCT_FOR_ID(tell) STRUCT_FOR_ID(text) STRUCT_FOR_ID(threading) STRUCT_FOR_ID(throw) STRUCT_FOR_ID(top) + STRUCT_FOR_ID(traceback) + STRUCT_FOR_ID(translate) STRUCT_FOR_ID(truncate) + STRUCT_FOR_ID(type) + STRUCT_FOR_ID(unlink) STRUCT_FOR_ID(unraisablehook) + STRUCT_FOR_ID(value) STRUCT_FOR_ID(values) STRUCT_FOR_ID(version) STRUCT_FOR_ID(warnings) STRUCT_FOR_ID(warnoptions) STRUCT_FOR_ID(writable) STRUCT_FOR_ID(write) + STRUCT_FOR_ID(x) STRUCT_FOR_ID(zipimporter) } identifiers; }; diff --git a/Include/internal/pycore_runtime_init.h b/Include/internal/pycore_runtime_init.h index 2f2bc65cd71116..8161252006ccea 100644 --- a/Include/internal/pycore_runtime_init.h +++ b/Include/internal/pycore_runtime_init.h @@ -837,11 +837,20 @@ extern "C" { INIT_ID(_uninitialized_submodules), \ INIT_ID(_warn_unawaited_coroutine), \ INIT_ID(_xoptions), \ + INIT_ID(a), \ + INIT_ID(access), \ INIT_ID(add), \ INIT_ID(append), \ + INIT_ID(argv), \ + INIT_ID(b), \ + INIT_ID(base), \ INIT_ID(big), \ INIT_ID(buffer), \ + INIT_ID(buffering), \ + INIT_ID(bufsize), \ INIT_ID(builtins), \ + INIT_ID(byteorder), \ + INIT_ID(bytes), \ INIT_ID(c_call), \ INIT_ID(c_exception), \ INIT_ID(c_return), \ @@ -850,79 +859,121 @@ extern "C" { INIT_ID(close), \ INIT_ID(closed), \ INIT_ID(code), \ + INIT_ID(cookie), \ INIT_ID(copy), \ INIT_ID(copyreg), \ + INIT_ID(count), \ + INIT_ID(cwd), \ + INIT_ID(data), \ INIT_ID(decode), \ + INIT_ID(decoder), \ INIT_ID(default), \ INIT_ID(defaultaction), \ + INIT_ID(dict), \ INIT_ID(dictcomp), \ INIT_ID(difference_update), \ + INIT_ID(dir_fd), \ INIT_ID(dispatch_table), \ INIT_ID(displayhook), \ + INIT_ID(dont_inherit), \ INIT_ID(enable), \ INIT_ID(encode), \ INIT_ID(encoding), \ + INIT_ID(end), \ INIT_ID(end_lineno), \ INIT_ID(end_offset), \ + INIT_ID(env), \ INIT_ID(errors), \ + INIT_ID(exc_type), \ + INIT_ID(exc_value), \ INIT_ID(excepthook), \ INIT_ID(exception), \ INIT_ID(extend), \ + INIT_ID(factory), \ + INIT_ID(fd), \ + INIT_ID(file), \ INIT_ID(filename), \ INIT_ID(fileno), \ + INIT_ID(filepath), \ INIT_ID(fillvalue), \ INIT_ID(filters), \ + INIT_ID(final), \ INIT_ID(find_class), \ + INIT_ID(flags), \ INIT_ID(flush), \ + INIT_ID(follow_symlinks), \ + INIT_ID(format), \ + INIT_ID(func), \ INIT_ID(genexpr), \ INIT_ID(get), \ INIT_ID(get_source), \ INIT_ID(getattr), \ INIT_ID(getstate), \ + INIT_ID(globals), \ + INIT_ID(hook), \ + INIT_ID(id), \ INIT_ID(ignore), \ INIT_ID(importlib), \ INIT_ID(inf), \ + INIT_ID(input), \ INIT_ID(intersection), \ INIT_ID(isatty), \ + INIT_ID(item), \ INIT_ID(items), \ INIT_ID(iter), \ INIT_ID(join), \ + INIT_ID(keepends), \ + INIT_ID(key), \ INIT_ID(keys), \ INIT_ID(lambda), \ INIT_ID(last_traceback), \ INIT_ID(last_type), \ INIT_ID(last_value), \ INIT_ID(latin1), \ + INIT_ID(level), \ INIT_ID(line), \ INIT_ID(lineno), \ INIT_ID(listcomp), \ INIT_ID(little), \ INIT_ID(locale), \ + INIT_ID(mapping), \ INIT_ID(match), \ + INIT_ID(message), \ INIT_ID(metaclass), \ + INIT_ID(method), \ + INIT_ID(mod), \ INIT_ID(mode), \ INIT_ID(modules), \ INIT_ID(mro), \ INIT_ID(msg), \ + INIT_ID(n), \ INIT_ID(n_fields), \ INIT_ID(n_sequence_fields), \ INIT_ID(n_unnamed_fields), \ INIT_ID(name), \ INIT_ID(newlines), \ + INIT_ID(ns), \ INIT_ID(obj), \ + INIT_ID(object), \ INIT_ID(offset), \ INIT_ID(onceregistry), \ INIT_ID(opcode), \ INIT_ID(open), \ + INIT_ID(optimize), \ + INIT_ID(owner), \ + INIT_ID(p), \ INIT_ID(parent), \ INIT_ID(partial), \ INIT_ID(path), \ INIT_ID(peek), \ INIT_ID(persistent_id), \ INIT_ID(persistent_load), \ + INIT_ID(pid), \ + INIT_ID(pos), \ INIT_ID(print_file_and_line), \ INIT_ID(ps1), \ INIT_ID(ps2), \ + INIT_ID(r), \ INIT_ID(raw), \ INIT_ID(read), \ INIT_ID(read1), \ @@ -936,31 +987,48 @@ extern "C" { INIT_ID(replace), \ INIT_ID(reset), \ INIT_ID(return), \ + INIT_ID(reverse), \ INIT_ID(reversed), \ + INIT_ID(s), \ INIT_ID(seek), \ INIT_ID(seekable), \ INIT_ID(send), \ + INIT_ID(sep), \ INIT_ID(setcomp), \ INIT_ID(setstate), \ + INIT_ID(size), \ + INIT_ID(sizehint), \ INIT_ID(sort), \ + INIT_ID(source), \ + INIT_ID(stacklevel), \ + INIT_ID(start), \ INIT_ID(stderr), \ INIT_ID(stdin), \ INIT_ID(stdout), \ INIT_ID(strict), \ + INIT_ID(string), \ INIT_ID(symmetric_difference_update), \ + INIT_ID(tag), \ + INIT_ID(target), \ INIT_ID(tell), \ INIT_ID(text), \ INIT_ID(threading), \ INIT_ID(throw), \ INIT_ID(top), \ + INIT_ID(traceback), \ + INIT_ID(translate), \ INIT_ID(truncate), \ + INIT_ID(type), \ + INIT_ID(unlink), \ INIT_ID(unraisablehook), \ + INIT_ID(value), \ INIT_ID(values), \ INIT_ID(version), \ INIT_ID(warnings), \ INIT_ID(warnoptions), \ INIT_ID(writable), \ INIT_ID(write), \ + INIT_ID(x), \ INIT_ID(zipimporter), \ }, \ }, \ diff --git a/Tools/scripts/generate_global_objects.py b/Tools/scripts/generate_global_objects.py index 639d8fa91c68bd..867358cda89194 100644 --- a/Tools/scripts/generate_global_objects.py +++ b/Tools/scripts/generate_global_objects.py @@ -259,7 +259,7 @@ def generate_runtime_init(identifiers, strings): printer.write(after) -def get_identifiers_and_strings() -> tuple[set[str], dict[str, str]]: +def get_identifiers_and_strings() -> 'tuple[set[str], dict[str, str]]': identifiers = set(IDENTIFIERS) strings = dict(STRING_LITERALS) for name, string, *_ in iter_global_strings(): From a44f634f6b1c6f5860f58e374287f163ecf7be32 Mon Sep 17 00:00:00 2001 From: Eric Snow Date: Tue, 1 Mar 2022 13:47:54 -0700 Subject: [PATCH 2/3] Make sure deepfreeze runs before regen-global-objects. --- Makefile.pre.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index 0383853901df1e..7b6f54a9ae0a7a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1176,7 +1176,7 @@ regen-importlib: regen-frozen # Global objects .PHONY: regen-global-objects -regen-global-objects: $(srcdir)/Tools/scripts/generate_global_objects.py +regen-global-objects: regen-deepfreeze $(srcdir)/Tools/scripts/generate_global_objects.py $(PYTHON_FOR_REGEN) $(srcdir)/Tools/scripts/generate_global_objects.py ############################################################################ From 974689531303854703c2fc1b35c2740b67be699f Mon Sep 17 00:00:00 2001 From: Eric Snow Date: Tue, 1 Mar 2022 13:48:51 -0700 Subject: [PATCH 3/3] Drop accidental IDs. --- Include/internal/pycore_global_strings.h | 68 ------------------------ Include/internal/pycore_runtime_init.h | 68 ------------------------ 2 files changed, 136 deletions(-) diff --git a/Include/internal/pycore_global_strings.h b/Include/internal/pycore_global_strings.h index 2b82a7d09e18da..2a42dc16ce1b55 100644 --- a/Include/internal/pycore_global_strings.h +++ b/Include/internal/pycore_global_strings.h @@ -222,20 +222,11 @@ struct _Py_global_strings { STRUCT_FOR_ID(_uninitialized_submodules) STRUCT_FOR_ID(_warn_unawaited_coroutine) STRUCT_FOR_ID(_xoptions) - STRUCT_FOR_ID(a) - STRUCT_FOR_ID(access) STRUCT_FOR_ID(add) STRUCT_FOR_ID(append) - STRUCT_FOR_ID(argv) - STRUCT_FOR_ID(b) - STRUCT_FOR_ID(base) STRUCT_FOR_ID(big) STRUCT_FOR_ID(buffer) - STRUCT_FOR_ID(buffering) - STRUCT_FOR_ID(bufsize) STRUCT_FOR_ID(builtins) - STRUCT_FOR_ID(byteorder) - STRUCT_FOR_ID(bytes) STRUCT_FOR_ID(c_call) STRUCT_FOR_ID(c_exception) STRUCT_FOR_ID(c_return) @@ -244,121 +235,79 @@ struct _Py_global_strings { STRUCT_FOR_ID(close) STRUCT_FOR_ID(closed) STRUCT_FOR_ID(code) - STRUCT_FOR_ID(cookie) STRUCT_FOR_ID(copy) STRUCT_FOR_ID(copyreg) - STRUCT_FOR_ID(count) - STRUCT_FOR_ID(cwd) - STRUCT_FOR_ID(data) STRUCT_FOR_ID(decode) - STRUCT_FOR_ID(decoder) STRUCT_FOR_ID(default) STRUCT_FOR_ID(defaultaction) - STRUCT_FOR_ID(dict) STRUCT_FOR_ID(dictcomp) STRUCT_FOR_ID(difference_update) - STRUCT_FOR_ID(dir_fd) STRUCT_FOR_ID(dispatch_table) STRUCT_FOR_ID(displayhook) - STRUCT_FOR_ID(dont_inherit) STRUCT_FOR_ID(enable) STRUCT_FOR_ID(encode) STRUCT_FOR_ID(encoding) - STRUCT_FOR_ID(end) STRUCT_FOR_ID(end_lineno) STRUCT_FOR_ID(end_offset) - STRUCT_FOR_ID(env) STRUCT_FOR_ID(errors) - STRUCT_FOR_ID(exc_type) - STRUCT_FOR_ID(exc_value) STRUCT_FOR_ID(excepthook) STRUCT_FOR_ID(exception) STRUCT_FOR_ID(extend) - STRUCT_FOR_ID(factory) - STRUCT_FOR_ID(fd) - STRUCT_FOR_ID(file) STRUCT_FOR_ID(filename) STRUCT_FOR_ID(fileno) - STRUCT_FOR_ID(filepath) STRUCT_FOR_ID(fillvalue) STRUCT_FOR_ID(filters) - STRUCT_FOR_ID(final) STRUCT_FOR_ID(find_class) - STRUCT_FOR_ID(flags) STRUCT_FOR_ID(flush) - STRUCT_FOR_ID(follow_symlinks) - STRUCT_FOR_ID(format) - STRUCT_FOR_ID(func) STRUCT_FOR_ID(genexpr) STRUCT_FOR_ID(get) STRUCT_FOR_ID(get_source) STRUCT_FOR_ID(getattr) STRUCT_FOR_ID(getstate) - STRUCT_FOR_ID(globals) - STRUCT_FOR_ID(hook) - STRUCT_FOR_ID(id) STRUCT_FOR_ID(ignore) STRUCT_FOR_ID(importlib) STRUCT_FOR_ID(inf) - STRUCT_FOR_ID(input) STRUCT_FOR_ID(intersection) STRUCT_FOR_ID(isatty) - STRUCT_FOR_ID(item) STRUCT_FOR_ID(items) STRUCT_FOR_ID(iter) STRUCT_FOR_ID(join) - STRUCT_FOR_ID(keepends) - STRUCT_FOR_ID(key) STRUCT_FOR_ID(keys) STRUCT_FOR_ID(lambda) STRUCT_FOR_ID(last_traceback) STRUCT_FOR_ID(last_type) STRUCT_FOR_ID(last_value) STRUCT_FOR_ID(latin1) - STRUCT_FOR_ID(level) STRUCT_FOR_ID(line) STRUCT_FOR_ID(lineno) STRUCT_FOR_ID(listcomp) STRUCT_FOR_ID(little) STRUCT_FOR_ID(locale) - STRUCT_FOR_ID(mapping) STRUCT_FOR_ID(match) - STRUCT_FOR_ID(message) STRUCT_FOR_ID(metaclass) - STRUCT_FOR_ID(method) - STRUCT_FOR_ID(mod) STRUCT_FOR_ID(mode) STRUCT_FOR_ID(modules) STRUCT_FOR_ID(mro) STRUCT_FOR_ID(msg) - STRUCT_FOR_ID(n) STRUCT_FOR_ID(n_fields) STRUCT_FOR_ID(n_sequence_fields) STRUCT_FOR_ID(n_unnamed_fields) STRUCT_FOR_ID(name) STRUCT_FOR_ID(newlines) - STRUCT_FOR_ID(ns) STRUCT_FOR_ID(obj) - STRUCT_FOR_ID(object) STRUCT_FOR_ID(offset) STRUCT_FOR_ID(onceregistry) STRUCT_FOR_ID(opcode) STRUCT_FOR_ID(open) - STRUCT_FOR_ID(optimize) - STRUCT_FOR_ID(owner) - STRUCT_FOR_ID(p) STRUCT_FOR_ID(parent) STRUCT_FOR_ID(partial) STRUCT_FOR_ID(path) STRUCT_FOR_ID(peek) STRUCT_FOR_ID(persistent_id) STRUCT_FOR_ID(persistent_load) - STRUCT_FOR_ID(pid) - STRUCT_FOR_ID(pos) STRUCT_FOR_ID(print_file_and_line) STRUCT_FOR_ID(ps1) STRUCT_FOR_ID(ps2) - STRUCT_FOR_ID(r) STRUCT_FOR_ID(raw) STRUCT_FOR_ID(read) STRUCT_FOR_ID(read1) @@ -372,48 +321,31 @@ struct _Py_global_strings { STRUCT_FOR_ID(replace) STRUCT_FOR_ID(reset) STRUCT_FOR_ID(return) - STRUCT_FOR_ID(reverse) STRUCT_FOR_ID(reversed) - STRUCT_FOR_ID(s) STRUCT_FOR_ID(seek) STRUCT_FOR_ID(seekable) STRUCT_FOR_ID(send) - STRUCT_FOR_ID(sep) STRUCT_FOR_ID(setcomp) STRUCT_FOR_ID(setstate) - STRUCT_FOR_ID(size) - STRUCT_FOR_ID(sizehint) STRUCT_FOR_ID(sort) - STRUCT_FOR_ID(source) - STRUCT_FOR_ID(stacklevel) - STRUCT_FOR_ID(start) STRUCT_FOR_ID(stderr) STRUCT_FOR_ID(stdin) STRUCT_FOR_ID(stdout) STRUCT_FOR_ID(strict) - STRUCT_FOR_ID(string) STRUCT_FOR_ID(symmetric_difference_update) - STRUCT_FOR_ID(tag) - STRUCT_FOR_ID(target) STRUCT_FOR_ID(tell) STRUCT_FOR_ID(text) STRUCT_FOR_ID(threading) STRUCT_FOR_ID(throw) STRUCT_FOR_ID(top) - STRUCT_FOR_ID(traceback) - STRUCT_FOR_ID(translate) STRUCT_FOR_ID(truncate) - STRUCT_FOR_ID(type) - STRUCT_FOR_ID(unlink) STRUCT_FOR_ID(unraisablehook) - STRUCT_FOR_ID(value) STRUCT_FOR_ID(values) STRUCT_FOR_ID(version) STRUCT_FOR_ID(warnings) STRUCT_FOR_ID(warnoptions) STRUCT_FOR_ID(writable) STRUCT_FOR_ID(write) - STRUCT_FOR_ID(x) STRUCT_FOR_ID(zipimporter) } identifiers; }; diff --git a/Include/internal/pycore_runtime_init.h b/Include/internal/pycore_runtime_init.h index 8161252006ccea..2f2bc65cd71116 100644 --- a/Include/internal/pycore_runtime_init.h +++ b/Include/internal/pycore_runtime_init.h @@ -837,20 +837,11 @@ extern "C" { INIT_ID(_uninitialized_submodules), \ INIT_ID(_warn_unawaited_coroutine), \ INIT_ID(_xoptions), \ - INIT_ID(a), \ - INIT_ID(access), \ INIT_ID(add), \ INIT_ID(append), \ - INIT_ID(argv), \ - INIT_ID(b), \ - INIT_ID(base), \ INIT_ID(big), \ INIT_ID(buffer), \ - INIT_ID(buffering), \ - INIT_ID(bufsize), \ INIT_ID(builtins), \ - INIT_ID(byteorder), \ - INIT_ID(bytes), \ INIT_ID(c_call), \ INIT_ID(c_exception), \ INIT_ID(c_return), \ @@ -859,121 +850,79 @@ extern "C" { INIT_ID(close), \ INIT_ID(closed), \ INIT_ID(code), \ - INIT_ID(cookie), \ INIT_ID(copy), \ INIT_ID(copyreg), \ - INIT_ID(count), \ - INIT_ID(cwd), \ - INIT_ID(data), \ INIT_ID(decode), \ - INIT_ID(decoder), \ INIT_ID(default), \ INIT_ID(defaultaction), \ - INIT_ID(dict), \ INIT_ID(dictcomp), \ INIT_ID(difference_update), \ - INIT_ID(dir_fd), \ INIT_ID(dispatch_table), \ INIT_ID(displayhook), \ - INIT_ID(dont_inherit), \ INIT_ID(enable), \ INIT_ID(encode), \ INIT_ID(encoding), \ - INIT_ID(end), \ INIT_ID(end_lineno), \ INIT_ID(end_offset), \ - INIT_ID(env), \ INIT_ID(errors), \ - INIT_ID(exc_type), \ - INIT_ID(exc_value), \ INIT_ID(excepthook), \ INIT_ID(exception), \ INIT_ID(extend), \ - INIT_ID(factory), \ - INIT_ID(fd), \ - INIT_ID(file), \ INIT_ID(filename), \ INIT_ID(fileno), \ - INIT_ID(filepath), \ INIT_ID(fillvalue), \ INIT_ID(filters), \ - INIT_ID(final), \ INIT_ID(find_class), \ - INIT_ID(flags), \ INIT_ID(flush), \ - INIT_ID(follow_symlinks), \ - INIT_ID(format), \ - INIT_ID(func), \ INIT_ID(genexpr), \ INIT_ID(get), \ INIT_ID(get_source), \ INIT_ID(getattr), \ INIT_ID(getstate), \ - INIT_ID(globals), \ - INIT_ID(hook), \ - INIT_ID(id), \ INIT_ID(ignore), \ INIT_ID(importlib), \ INIT_ID(inf), \ - INIT_ID(input), \ INIT_ID(intersection), \ INIT_ID(isatty), \ - INIT_ID(item), \ INIT_ID(items), \ INIT_ID(iter), \ INIT_ID(join), \ - INIT_ID(keepends), \ - INIT_ID(key), \ INIT_ID(keys), \ INIT_ID(lambda), \ INIT_ID(last_traceback), \ INIT_ID(last_type), \ INIT_ID(last_value), \ INIT_ID(latin1), \ - INIT_ID(level), \ INIT_ID(line), \ INIT_ID(lineno), \ INIT_ID(listcomp), \ INIT_ID(little), \ INIT_ID(locale), \ - INIT_ID(mapping), \ INIT_ID(match), \ - INIT_ID(message), \ INIT_ID(metaclass), \ - INIT_ID(method), \ - INIT_ID(mod), \ INIT_ID(mode), \ INIT_ID(modules), \ INIT_ID(mro), \ INIT_ID(msg), \ - INIT_ID(n), \ INIT_ID(n_fields), \ INIT_ID(n_sequence_fields), \ INIT_ID(n_unnamed_fields), \ INIT_ID(name), \ INIT_ID(newlines), \ - INIT_ID(ns), \ INIT_ID(obj), \ - INIT_ID(object), \ INIT_ID(offset), \ INIT_ID(onceregistry), \ INIT_ID(opcode), \ INIT_ID(open), \ - INIT_ID(optimize), \ - INIT_ID(owner), \ - INIT_ID(p), \ INIT_ID(parent), \ INIT_ID(partial), \ INIT_ID(path), \ INIT_ID(peek), \ INIT_ID(persistent_id), \ INIT_ID(persistent_load), \ - INIT_ID(pid), \ - INIT_ID(pos), \ INIT_ID(print_file_and_line), \ INIT_ID(ps1), \ INIT_ID(ps2), \ - INIT_ID(r), \ INIT_ID(raw), \ INIT_ID(read), \ INIT_ID(read1), \ @@ -987,48 +936,31 @@ extern "C" { INIT_ID(replace), \ INIT_ID(reset), \ INIT_ID(return), \ - INIT_ID(reverse), \ INIT_ID(reversed), \ - INIT_ID(s), \ INIT_ID(seek), \ INIT_ID(seekable), \ INIT_ID(send), \ - INIT_ID(sep), \ INIT_ID(setcomp), \ INIT_ID(setstate), \ - INIT_ID(size), \ - INIT_ID(sizehint), \ INIT_ID(sort), \ - INIT_ID(source), \ - INIT_ID(stacklevel), \ - INIT_ID(start), \ INIT_ID(stderr), \ INIT_ID(stdin), \ INIT_ID(stdout), \ INIT_ID(strict), \ - INIT_ID(string), \ INIT_ID(symmetric_difference_update), \ - INIT_ID(tag), \ - INIT_ID(target), \ INIT_ID(tell), \ INIT_ID(text), \ INIT_ID(threading), \ INIT_ID(throw), \ INIT_ID(top), \ - INIT_ID(traceback), \ - INIT_ID(translate), \ INIT_ID(truncate), \ - INIT_ID(type), \ - INIT_ID(unlink), \ INIT_ID(unraisablehook), \ - INIT_ID(value), \ INIT_ID(values), \ INIT_ID(version), \ INIT_ID(warnings), \ INIT_ID(warnoptions), \ INIT_ID(writable), \ INIT_ID(write), \ - INIT_ID(x), \ INIT_ID(zipimporter), \ }, \ }, \