From 7bca924fdbecb13e9c5fd72568cdd8f77101fe07 Mon Sep 17 00:00:00 2001 From: chemelnucfin <3982092+chemelnucfin@users.noreply.github.com> Date: Sun, 31 Aug 2025 07:23:40 -0700 Subject: [PATCH 1/2] gh-138279: Remove unused attr in RuleCollectorVisitor in parser_generator.py (#138280) --- Tools/peg_generator/pegen/parser_generator.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Tools/peg_generator/pegen/parser_generator.py b/Tools/peg_generator/pegen/parser_generator.py index 976f5e6e57d7c6..a4360eb86ada50 100644 --- a/Tools/peg_generator/pegen/parser_generator.py +++ b/Tools/peg_generator/pegen/parser_generator.py @@ -44,8 +44,7 @@ class RuleCollectorVisitor(GrammarVisitor): """Visitor that invokes a provided callmaker visitor with just the NamedItem nodes""" - def __init__(self, rules: Dict[str, Rule], callmakervisitor: GrammarVisitor) -> None: - self.rules = rules + def __init__(self, callmakervisitor: GrammarVisitor) -> None: self.callmaker = callmakervisitor def visit_Rule(self, rule: Rule) -> None: @@ -163,7 +162,7 @@ def collect_rules(self) -> None: for rule in self.all_rules.values(): keyword_collector.visit(rule) - rule_collector = RuleCollectorVisitor(self.rules, self.callmakervisitor) + rule_collector = RuleCollectorVisitor(self.callmakervisitor) done: Set[str] = set() while True: computed_rules = list(self.all_rules) From 552cf86b83e8aafebcfe9abbc77101bdbfda14c8 Mon Sep 17 00:00:00 2001 From: Fangyi Zhou Date: Sun, 31 Aug 2025 16:50:23 +0100 Subject: [PATCH 2/2] gh-138295: Fix a grammar issue in the descriptor HOWTO (GH-138296) "an str" -> "a str" --- Doc/howto/descriptor.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/howto/descriptor.rst b/Doc/howto/descriptor.rst index f6c3e473f1c36d..9d5a9ac8b718cb 100644 --- a/Doc/howto/descriptor.rst +++ b/Doc/howto/descriptor.rst @@ -420,7 +420,7 @@ Here are three practical data validation utilities: def validate(self, value): if not isinstance(value, str): - raise TypeError(f'Expected {value!r} to be an str') + raise TypeError(f'Expected {value!r} to be a str') if self.minsize is not None and len(value) < self.minsize: raise ValueError( f'Expected {value!r} to be no smaller than {self.minsize!r}'