Skip to content

Commit

Permalink
gh-108494: Argument Clinic: fix option group for Limited C API (#108574)
Browse files Browse the repository at this point in the history
Use PyTuple_Size() instead of PyTuple_GET_SIZE().
  • Loading branch information
vstinner authored Aug 29, 2023
1 parent 0d140b8 commit e675e51
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions Tools/clinic/clinic.py
Original file line number Diff line number Diff line change
Expand Up @@ -1664,7 +1664,8 @@ def group_to_variable_name(group: int) -> str:
def render_option_group_parsing(
self,
f: Function,
template_dict: TemplateDict
template_dict: TemplateDict,
limited_capi: bool,
) -> None:
# positional only, grouped, optional arguments!
# can be optional on the left or right.
Expand Down Expand Up @@ -1712,7 +1713,11 @@ def render_option_group_parsing(
count_min = sys.maxsize
count_max = -1

add("switch (PyTuple_GET_SIZE(args)) {\n")
if limited_capi:
nargs = 'PyTuple_Size(args)'
else:
nargs = 'PyTuple_GET_SIZE(args)'
add(f"switch ({nargs}) {{\n")
for subset in permute_optional_groups(left, required, right):
count = len(subset)
count_min = min(count_min, count)
Expand Down Expand Up @@ -1869,7 +1874,8 @@ def render_function(
template_dict['unpack_max'] = str(unpack_max)

if has_option_groups:
self.render_option_group_parsing(f, template_dict)
self.render_option_group_parsing(f, template_dict,
limited_capi=clinic.limited_capi)

# buffers, not destination
for name, destination in clinic.destination_buffers.items():
Expand Down

0 comments on commit e675e51

Please sign in to comment.