Skip to content

[3.15] gh-155218: Generate the option group flags in a stable order (GH-155219) #155226

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

Open
serhiy-storchaka wants to merge 1 commit into
base: 3.15
Choose a base branch
from
+15 −11
Open

[3.15] gh-155218: Generate the option group flags in a stable order (GH-155219) #155226

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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Tools-Demos/2026-08-05-14-02-55.gh-issue-155218.Nq4xZv.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix Argument Clinic generating the flags of the optional groups in
different order on 32-bit and 64-bit platforms.
18 changes: 9 additions & 9 deletions Modules/clinic/_cursesmodule.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions Tools/clinic/libclinic/clanguage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,9 @@ def render_option_group_parsing(
""")
continue

group_ids = {p.group for p in subset} # eliminate duplicates
# A set would eliminate duplicates too, but the iteration
# order of small negative integers depends on the platform.
group_ids = dict.fromkeys(p.group for p in subset)
d: dict[str, str | int] = {}
d['count'] = count
d['name'] = f.name
Expand All @@ -331,7 +333,7 @@ def render_option_group_parsing(
p.converter.parse_argument(parse_arguments)
d['parse_arguments'] = ", ".join(parse_arguments)

group_ids.discard(0)
group_ids.pop(0, None)
lines = "\n".join([
self.group_to_variable_name(g) + " = 1;"
for g in group_ids
Expand Down
Loading