Skip to content

Honor InvalidRepeatedCapabilityError extra error metadata in converters.py #2244

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

Draft
mohit-emerson wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Honor InvalidRepeatedCapabilityError extra error metadata in converters.py #2244

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff456db
Skip repeated capability validation when InvalidRepeatedCapabilityErr…
mohit-emerson Oct 27, 2026
06956c4
cleanup
mohit-emerson Oct 28, 2026
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
11 changes: 11 additions & 0 deletions build/templates/_converters.py.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@ ${template_parameters['encoding_tag']}
config = template_parameters['metadata'].config
module_name = config['module_name']
extra_errors_used = config['extra_errors_used']
validate_repeated_capabilities = 'InvalidRepeatedCapabilityError' in extra_errors_used or len(config['repeated_capabilities']) == 0
enums = config['enums']
%>\
import ${module_name}._visatype as _visatype
% if any(helper.enum_uses_converter(enums[enum_name]) for enum_name in helper.filter_codegen_enums(enums)):
import ${module_name}.enums as enums
% endif
% if validate_repeated_capabilities:
import ${module_name}.errors as errors
% endif

import array
import collections
Expand Down Expand Up @@ -51,7 +54,11 @@ def _convert_repeated_capabilities(arg, prefix): # noqa: F811
- (slice(0, 1), '2', [4, '5-6'], '7-9', '11:14', '16, 17') -->
['0', '2', '4', '5', '6', '7', '8', '9', '11', '12', '13', '14', '16', '17']
'''
% if validate_repeated_capabilities:
raise errors.InvalidRepeatedCapabilityError('Invalid type', type(arg))
% else:
raise TypeError('Invalid type for a repeated capability: {}'.format(type(arg)))
% endif


@_convert_repeated_capabilities.register(numbers.Integral) # noqa: F811
Expand All @@ -77,9 +84,13 @@ def _(repeated_capability, prefix):
# We remove any prefix and change ':' to '-'
r = repeated_capability.strip().replace(prefix, '').replace(':', '-')
rc = r.split('-')
% if validate_repeated_capabilities:
if len(rc) > 1:
if len(rc) > 2:
raise errors.InvalidRepeatedCapabilityError("Multiple '-' or ':'", repeated_capability)
% else:
if len(rc) == 2:
% endif
try:
start = int(rc[0])
end = int(rc[1])
Expand Down
Loading