From: Yu Watanabe Date: Tue, 17 Feb 2026 11:33:54 +0000 (+0900) Subject: Revert "generate-bpf-delegate-configs: fix compatibility with Python 3.7" X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ff27c8012c214c5d02feb20a5eafafbefaf1c1d;p=thirdparty%2Fsystemd.git Revert "generate-bpf-delegate-configs: fix compatibility with Python 3.7" This reverts commit dee77ac201741709b2323cae73aeeaff60fd8521. Now we require Python 3.9 or newer. --- diff --git a/src/core/generate-bpf-delegate-configs.py b/src/core/generate-bpf-delegate-configs.py index 4444282b4b5..200c913b8a8 100755 --- a/src/core/generate-bpf-delegate-configs.py +++ b/src/core/generate-bpf-delegate-configs.py @@ -7,7 +7,6 @@ import re import sys -import typing def print_usage_and_exit() -> None: @@ -27,7 +26,7 @@ if output not in ['code', 'doc']: with open(header) as file: inEnum = False - enumValues: typing.List[str] = [] + enumValues: list[str] = [] enumName = '' if output == 'doc': @@ -68,12 +67,10 @@ with open(header) as file: match = re.fullmatch(r'(\w+)\b,', line) if match and len(match.groups()) > 0 and not match[1].startswith('__'): enumValues.append(match[1]) - else: - match = re.match(r'^\s*enum\s+bpf_(cmd|map_type|prog_type|attach_type)+\s*{', line) - if match: - # Start of a new enum - inEnum = True - enumName = 'bpf_delegate_' + match[1] + elif match := re.match(r'^\s*enum\s+bpf_(cmd|map_type|prog_type|attach_type)+\s*{', line): + # Start of a new enum + inEnum = True + enumName = 'bpf_delegate_' + match[1] if output == 'doc': print('')