More f strings!

Author: sobolevn

Tools/peg_generator/.ruff.toml

@@ -6,22 +6,13 @@ extend-exclude = [
 
 [lint]
 select = [
-    "F",  # Enable all pyflakes rules
-    "I",  # Enable all isort rules
-    "UP",  # Enable all pyupgrade rules by default
+    "F",       # pyflakes
+    "I",       # isort
+    "UP",      # pyupgrade
     "RUF100",  # Ban unused `# noqa` comments
     "PGH004",  # Ban blanket `# noqa` comments (only ignore specific error codes)
 ]
 ignore = [
-    # Unnecessary parentheses to functools.lru_cache: just leads to unnecessary churn.
-    # https://github.com/python/cpython/pull/104684#discussion_r1199653347.
-    "UP011",
-    # Use format specifiers instead of %-style formatting.
-    # Doesn't always make code more readable.
-    "UP031",
-    # Use f-strings instead of format specifiers.
-    # Doesn't always make code more readable.
-    "UP032",
     # Use PEP-604 unions rather than tuples for isinstance() checks.
     # Makes code slower and more verbose. https://github.com/astral-sh/ruff/issues/7871.
     "UP038",

Tools/peg_generator/pegen/ast_dump.py

@@ -65,5 +65,5 @@ def _format(node: Any, level: int = 0) -> tuple[str, bool]:
         return repr(node), True
 
     if all(cls.__name__ != "AST" for cls in node.__class__.__mro__):
-        raise TypeError("expected AST, got %r" % node.__class__.__name__)
+        raise TypeError(f"expected AST, got {node.__class__.__name__!r}")
     return _format(node)[0]

Tools/peg_generator/pegen/tokenizer.py

@@ -8,7 +8,11 @@
 
 
 def shorttok(tok: tokenize.TokenInfo) -> str:
-    return "%-25.25s" % f"{tok.start[0]}.{tok.start[1]}: {token.tok_name[tok.type]}:{tok.string!r}"
+    formatted = (
+        f"{tok.start[0]}.{tok.start[1]}: "
+        f"{token.tok_name[tok.type]}:{tok.string!r}"
+    )
+    return f"{formatted:<25.25}"
 
 
 class Tokenizer: