From e675e515aeed16cb5091e310cb161b10c16a237d Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Tue, 29 Aug 2023 13:33:28 +0200 Subject: gh-108494: Argument Clinic: fix option group for Limited C API (#108574) Use PyTuple_Size() instead of PyTuple_GET_SIZE(). --- Tools/clinic/clinic.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py index 2b01668..ec5bf30 100755 --- a/Tools/clinic/clinic.py +++ b/Tools/clinic/clinic.py @@ -1664,7 +1664,8 @@ class CLanguage(Language): 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. @@ -1712,7 +1713,11 @@ class CLanguage(Language): 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) @@ -1869,7 +1874,8 @@ class CLanguage(Language): 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(): -- cgit v0.12