From ee78d01a61f44c31b8add2bffe687718d2d34d60 Mon Sep 17 00:00:00 2001 From: Alex Waygood Date: Fri, 4 Aug 2023 01:17:17 +0100 Subject: [PATCH] gh-104146: Argument clinic: remove unused methods and variables (#107608) --- Tools/clinic/clinic.py | 20 +++++--------------- Tools/clinic/cpp.py | 8 -------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py index 1bcdb6b1c36..733a83ee58c 100755 --- a/Tools/clinic/clinic.py +++ b/Tools/clinic/clinic.py @@ -377,8 +377,10 @@ def version_splitter(s: str) -> tuple[int, ...]: return tuple(version) def version_comparitor(version1: str, version2: str) -> Literal[-1, 0, 1]: - iterator = itertools.zip_longest(version_splitter(version1), version_splitter(version2), fillvalue=0) - for i, (a, b) in enumerate(iterator): + iterator = itertools.zip_longest( + version_splitter(version1), version_splitter(version2), fillvalue=0 + ) + for a, b in iterator: if a < b: return -1 if a > b: @@ -4368,19 +4370,11 @@ class IndentStack: """ return len(self.indents) - def indent(self, line: str) -> str: - """ - Indents a line by the currently defined margin. - """ - assert self.margin is not None, "Cannot call .indent() before calling .infer()" - return self.margin + line - def dedent(self, line: str) -> str: """ Dedents a line by the currently defined margin. - (The inverse of 'indent'.) """ - assert self.margin is not None, "Cannot call .indent() before calling .infer()" + assert self.margin is not None, "Cannot call .dedent() before calling .infer()" margin = self.margin indent = self.indents[-1] if not line.startswith(margin): @@ -4641,10 +4635,6 @@ class DSLParser: return True - @staticmethod - def calculate_indent(line: str) -> int: - return len(line) - len(line.strip()) - def next( self, state: StateKeeper, diff --git a/Tools/clinic/cpp.py b/Tools/clinic/cpp.py index 5b7fa06494a..21a1b02e862 100644 --- a/Tools/clinic/cpp.py +++ b/Tools/clinic/cpp.py @@ -65,14 +65,6 @@ class Monitor: print(" ", ' '.join(str(x) for x in a)) sys.exit(-1) - def close(self) -> None: - if self.stack: - self.fail("Ended file while still in a preprocessor conditional block!") - - def write(self, s: str) -> None: - for line in s.split("\n"): - self.writeline(line) - def writeline(self, line: str) -> None: self.line_number += 1 line = line.strip()