[Python-checkins] gh-104683: Argument clinic: cleanup `DLSParser` `state_foo` methods (#107543)
AlexWaygood
webhook-mailer at python.org
Tue Aug 1 16:42:43 EDT 2023
https://github.com/python/cpython/commit/818c83cf819244bb0e77d956d28b84dd7434cabb
commit: 818c83cf819244bb0e77d956d28b84dd7434cabb
branch: main
author: Alex Waygood <Alex.Waygood at Gmail.com>
committer: AlexWaygood <Alex.Waygood at Gmail.com>
date: 2023-08-01T21:42:39+01:00
summary:
gh-104683: Argument clinic: cleanup `DLSParser` `state_foo` methods (#107543)
files:
M Tools/clinic/clinic.py
diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
index ba0132fc35903..f9409c7f088d6 100755
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -45,7 +45,6 @@
NamedTuple,
NoReturn,
Protocol,
- TypeGuard,
TypeVar,
cast,
overload,
@@ -4388,7 +4387,7 @@ def dedent(self, line: str) -> str:
return line[indent:]
-StateKeeper = Callable[[str | None], None]
+StateKeeper = Callable[[str], None]
ConverterArgs = dict[str, Any]
class ParamState(enum.IntEnum):
@@ -4610,9 +4609,7 @@ def parse(self, block: Block) -> None:
fail('Tab characters are illegal in the Clinic DSL.\n\t' + repr(line), line_number=block_start)
self.state(line)
- self.next(self.state_terminal)
- self.state(None)
-
+ self.do_post_block_processing_cleanup()
block.output.extend(self.clinic.language.render(self.clinic, block.signatures))
if self.preserve_output:
@@ -4621,10 +4618,7 @@ def parse(self, block: Block) -> None:
block.output = self.saved_output
@staticmethod
- def valid_line(line: str | None) -> TypeGuard[str]:
- if line is None:
- return False
-
+ def valid_line(line: str) -> bool:
# ignore comment-only lines
if line.lstrip().startswith('#'):
return False
@@ -4650,7 +4644,7 @@ def next(
if line is not None:
self.state(line)
- def state_dsl_start(self, line: str | None) -> None:
+ def state_dsl_start(self, line: str) -> None:
# self.block = self.ClinicOutputBlock(self)
if not self.valid_line(line):
return
@@ -4668,7 +4662,7 @@ def state_dsl_start(self, line: str | None) -> None:
self.next(self.state_modulename_name, line)
- def state_modulename_name(self, line: str | None) -> None:
+ def state_modulename_name(self, line: str) -> None:
# looking for declaration, which establishes the leftmost column
# line should be
# modulename.fnname [as c_basename] [-> return annotation]
@@ -4857,7 +4851,7 @@ def state_modulename_name(self, line: str | None) -> None:
# separate boolean state variables.) The states are defined in the
# ParamState class.
- def state_parameters_start(self, line: str | None) -> None:
+ def state_parameters_start(self, line: str) -> None:
if not self.valid_line(line):
return
@@ -4879,7 +4873,7 @@ def to_required(self) -> None:
for p in self.function.parameters.values():
p.group = -p.group
- def state_parameter(self, line: str | None) -> None:
+ def state_parameter(self, line: str) -> None:
assert isinstance(self.function, Function)
if not self.valid_line(line):
@@ -5262,7 +5256,7 @@ def parse_slash(self, function: Function) -> None:
"positional-only parameters, which is unsupported.")
p.kind = inspect.Parameter.POSITIONAL_ONLY
- def state_parameter_docstring_start(self, line: str | None) -> None:
+ def state_parameter_docstring_start(self, line: str) -> None:
assert self.indent.margin is not None, "self.margin.infer() has not yet been called to set the margin"
self.parameter_docstring_indent = len(self.indent.margin)
assert self.indent.depth == 3
@@ -5271,9 +5265,7 @@ def state_parameter_docstring_start(self, line: str | None) -> None:
# every line of the docstring must start with at least F spaces,
# where F > P.
# these F spaces will be stripped.
- def state_parameter_docstring(self, line: str | None) -> None:
- assert line is not None
-
+ def state_parameter_docstring(self, line: str) -> None:
stripped = line.strip()
if stripped.startswith('#'):
return
@@ -5301,9 +5293,8 @@ def state_parameter_docstring(self, line: str | None) -> None:
last_parameter.docstring = new_docstring
# the final stanza of the DSL is the docstring.
- def state_function_docstring(self, line: str | None) -> None:
+ def state_function_docstring(self, line: str) -> None:
assert self.function is not None
- assert line is not None
if self.group:
fail("Function " + self.function.name + " has a ] without a matching [.")
@@ -5572,12 +5563,10 @@ def add_parameter(text: str) -> None:
return docstring
- def state_terminal(self, line: str | None) -> None:
+ def do_post_block_processing_cleanup(self) -> None:
"""
Called when processing the block is done.
"""
- assert not line
-
if not self.function:
return
More information about the Python-checkins
mailing list