Skip to content

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

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

Merged
AlexWaygood merged 3 commits into from
May 21, 2023
Merged

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

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
763ce08
clinic.py: Modernise `parse_converter()` using pattern-matching
AlexWaygood May 20, 2023
0baef8c
static method
AlexWaygood May 21, 2023
144b9f9
Merge branch 'main' into clinic-parse_converter
AlexWaygood May 21, 2023
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
Next Next commit
clinic.py: Modernise parse_converter() using pattern-matching
  • Loading branch information
@AlexWaygood
AlexWaygood committed May 20, 2023
commit 763ce08e6bd160ee2a1ebebecaa5a05ff50a5502
37 changes: 21 additions & 16 deletions Tools/clinic/clinic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4906,22 +4906,27 @@ 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, {}

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
KwargDict = dict[str | None, Any]

def parse_converter(
self, annotation: ast.expr | None
Comment thread
AlexWaygood marked this conversation as resolved.
Outdated
) -> tuple[str, bool, KwargDict]:
match annotation:
case ast.Constant(value=str() as value):
return value, True, {}
Comment thread
AlexWaygood marked this conversation as resolved.
case ast.Name(name):
return name, False, {}
Comment thread
erlend-aasland marked this conversation as 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
Comment thread
erlend-aasland marked this conversation as resolved.
case _:
fail(
"Annotations must be either a name, a function call, or a string."
)
Comment thread
AlexWaygood marked this conversation as resolved.

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