gh-104683: Argument clinic: cleanup state_modulename_name() (#107340)

This commit is contained in:
Alex Waygood 2023-07-27 22:51:18 +01:00 • committed by GitHub
parent 2f9bb77764
commit c2b1689abc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 10 deletions

View file

@ -4730,6 +4730,7 @@ class DSLParser:
return
line, _, returns = line.partition('->')
returns = returns.strip()
full_name, _, c_basename = line.partition(' as ')
full_name = full_name.strip()
@ -4743,23 +4744,21 @@ class DSLParser:
return_converter = None
if returns:
ast_input = f"def x() -> {returns}: pass"
module = None
try:
module = ast.parse(ast_input)
module_node = ast.parse(ast_input)
except SyntaxError:
pass
if not module:
fail("Badly-formed annotation for " + full_name + ": " + returns)
fail(f"Badly formed annotation for {full_name}: {returns!r}")
function_node = module_node.body[0]
assert isinstance(function_node, ast.FunctionDef)
try:
name, legacy, kwargs = self.parse_converter(module.body[0].returns)
name, legacy, kwargs = self.parse_converter(function_node.returns)
if legacy:
fail("Legacy converter {!r} not allowed as a return converter"
.format(name))
fail(f"Legacy converter {name!r} not allowed as a return converter")
if name not in return_converters:
fail("No available return converter called " + repr(name))
fail(f"No available return converter called {name!r}")
return_converter = return_converters[name](**kwargs)
except ValueError:
fail("Badly-formed annotation for " + full_name + ": " + returns)
fail(f"Badly formed annotation for {full_name}: {returns!r}")
fields = [x.strip() for x in full_name.split('.')]
function_name = fields.pop()