Skip to content
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.

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

gh-104683: clinic.py: Modernise parse_converter() using pattern-matching #104696

Merged
merged 3 commits into from
May 21, 2023
Merged
Changes from all commits
Commits
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
34 changes: 19 additions & 15 deletions Tools/clinic/clinic.py
Original file line number Diff line number Diff line change
Expand Up @@ -5016,22 +5016,26 @@ def bad_node(self, node):
key = f"{parameter_name}_as_{c_name}" if c_name else parameter_name
self.function.parameters[key] = p

def parse_converter(self, annotation):
if (isinstance(annotation, ast.Constant) and
type(annotation.value) is str):
return annotation.value, True, {}
KwargDict = dict[str | None, Any]

if isinstance(annotation, ast.Name):
return annotation.id, False, {}

if not isinstance(annotation, ast.Call):
fail("Annotations must be either a name, a function call, or a string.")

name = annotation.func.id
symbols = globals()

kwargs = {node.arg: eval_ast_expr(node.value, symbols) for node in annotation.keywords}
return name, False, kwargs
@staticmethod
def parse_converter(annotation: ast.expr | None) -> tuple[str, bool, KwargDict]:
match annotation:
case ast.Constant(value=str() as value):
return value, True, {}
AlexWaygood marked this conversation as resolved.
Show resolved Hide resolved
case ast.Name(name):
return name, False, {}
erlend-aasland marked this conversation as resolved.
Show resolved Hide resolved
case ast.Call(func=ast.Name(name)):
symbols = globals()
kwargs = {
node.arg: eval_ast_expr(node.value, symbols)
for node in annotation.keywords
}
return name, False, kwargs
erlend-aasland marked this conversation as resolved.
Show resolved Hide resolved
case _:
fail(
"Annotations must be either a name, a function call, or a string."
)
AlexWaygood marked this conversation as resolved.
Show resolved Hide resolved

def parse_special_symbol(self, symbol):
if symbol == '*':
Expand Down