gh-138281: Run `ruff` on `Tools/peg_generator` #138282

sobolevn · 2025-08-31T08:05:13Z

Please, note this change:

if sys.version_info < (3, 10):
    print("ERROR: using pegen requires at least Python 3.10!", file=sys.stderr)

Technically we did not test python3.8 for a long time and used python_version = 3.10 for mypy, so I am pretty sure that 3.8 was not supported already.

I also removed topsort which was not used.

Issue: Run ruff on peg_generator #138281

Tools/peg_generator/pegen/__main__.py

vstinner · 2025-09-03T13:21:14Z

You might change the Python minimum version and remove topsort() in a separated change.

sobolevn · 2025-09-03T14:04:56Z

@vstinner done! I removed all semantic changes, now there are only ruff check changes.

Tools/peg_generator/.ruff.toml

hugovk · 2025-09-03T15:17:30Z

Tools/peg_generator/.ruff.toml

+    "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.


Fine to ignore these.

If you like, you could temporarily enable the locally, do a test run and see if it does make any of them more readable, and just commit those changes?

I don't think we have a lot of cases where not using f-strings is worse, but checking won't hurt indeed 👍

I am happy if most of the changes are an improvement in any case :)

Yeah, there were two cases, where f string is better :)

vstinner

LGTM

vstinner · 2025-09-03T16:36:10Z

Tools/peg_generator/pegen/grammar_visualizer.py

@@ -52,7 +53,7 @@ def main() -> None:
    try:
        grammar, parser, tokenizer = build_parser(args.filename)
    except Exception as err:
-        print("ERROR: Failed to parse grammar file", file=sys.stderr)
+        print("ERROR: Failed to parse grammar file", err, file=sys.stderr)


This change should be backported to stable Python versions.

Tools/peg_generator/.ruff.toml

Co-authored-by: Adam Turner <[email protected]>

miss-islington-app · 2025-09-03T17:45:34Z

Thanks @sobolevn for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13, 3.14.
🐍🍒⛏🤖

miss-islington-app · 2025-09-03T17:45:36Z

Sorry, @sobolevn, I could not cleanly backport this to 3.14 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 0d1f4e163990cb7e08b21d1fd88ff54bac5b0699 3.14

miss-islington-app · 2025-09-03T17:45:40Z

Sorry, @sobolevn, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 0d1f4e163990cb7e08b21d1fd88ff54bac5b0699 3.13

sobolevn · 2025-09-03T18:00:14Z

I will handle backports. Thanks everyone!

…-138282) (cherry picked from commit 0d1f4e1) Co-authored-by: sobolevn <[email protected]> Co-authored-by: Adam Turner <[email protected]>

bedevere-app · 2025-09-03T18:08:48Z

GH-138469 is a backport of this pull request to the 3.14 branch.

…-138282) (cherry picked from commit 0d1f4e1) Co-authored-by: sobolevn <[email protected]> Co-authored-by: Adam Turner <[email protected]>

bedevere-app · 2025-09-03T18:21:52Z

GH-138472 is a backport of this pull request to the 3.13 branch.

…38472) (cherry picked from commit 0d1f4e1) Co-authored-by: Adam Turner <[email protected]>

…38469) Co-authored-by: Adam Turner <[email protected]>

pythongh-138281: Run ruff on Tools/peg_generator

80f113a

sobolevn requested review from AA-Turner and AlexWaygood August 31, 2025 08:05

sobolevn requested review from pablogsal, lysnikolaou and hugovk as code owners August 31, 2025 08:05

bedevere-app bot added the awaiting core review label Aug 31, 2025

bedevere-app bot mentioned this pull request Aug 31, 2025

Run ruff on peg_generator #138281

Closed

sobolevn added skip news needs backport to 3.13 bugs and security fixes needs backport to 3.14 bugs and security fixes labels Aug 31, 2025

Fix Lint job

0535071

StanFromIreland reviewed Aug 31, 2025

View reviewed changes

Tools/peg_generator/pegen/__main__.py Outdated Show resolved Hide resolved

sobolevn added 2 commits September 3, 2025 16:56

Merge

e2a7bd9

Address review: restore the version and topsort

29cd9d8

hugovk approved these changes Sep 3, 2025

View reviewed changes

bedevere-app bot added awaiting merge and removed awaiting core review labels Sep 3, 2025

pablogsal approved these changes Sep 3, 2025

View reviewed changes

More f strings!

216fc93

vstinner approved these changes Sep 3, 2025

View reviewed changes

AA-Turner reviewed Sep 3, 2025

View reviewed changes

Tools/peg_generator/.ruff.toml Show resolved Hide resolved

Update Tools/peg_generator/.ruff.toml

53227dc

Co-authored-by: Adam Turner <[email protected]>

sobolevn enabled auto-merge (squash) September 3, 2025 17:19

sobolevn merged commit 0d1f4e1 into python:main Sep 3, 2025
51 checks passed

bedevere-app bot removed the awaiting merge label Sep 3, 2025

miss-islington-app bot assigned sobolevn Sep 3, 2025

bedevere-app bot removed the needs backport to 3.14 bugs and security fixes label Sep 3, 2025

bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Sep 3, 2025

sobolevn added a commit that referenced this pull request Sep 3, 2025

[3.13] gh-138281: Run ruff on Tools/peg_generator (GH-138282) (#1…

826d4eb

…38472) (cherry picked from commit 0d1f4e1) Co-authored-by: Adam Turner <[email protected]>

hugovk pushed a commit that referenced this pull request Sep 4, 2025

[3.14] gh-138281: Run ruff on Tools/peg_generator (GH-138282) (#1…

8e1c2fe

…38469) Co-authored-by: Adam Turner <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

gh-138281: Run `ruff` on `Tools/peg_generator` #138282

gh-138281: Run `ruff` on `Tools/peg_generator` #138282

sobolevn commented Aug 31, 2025 •

edited by bedevere-app bot

Loading

Uh oh!

Uh oh!

vstinner commented Sep 3, 2025

Uh oh!

sobolevn commented Sep 3, 2025 •

edited

Loading

Uh oh!

Uh oh!

hugovk Sep 3, 2025

Uh oh!

pablogsal Sep 3, 2025

Uh oh!

sobolevn Sep 3, 2025

Uh oh!

vstinner left a comment

Uh oh!

vstinner Sep 3, 2025

Uh oh!

Uh oh!

Uh oh!

miss-islington-app bot commented Sep 3, 2025

Uh oh!

miss-islington-app bot commented Sep 3, 2025

Uh oh!

miss-islington-app bot commented Sep 3, 2025

Uh oh!

sobolevn commented Sep 3, 2025

Uh oh!

bedevere-app bot commented Sep 3, 2025

Uh oh!

bedevere-app bot commented Sep 3, 2025

Uh oh!

Uh oh!

Uh oh!

gh-138281: Run ruff on Tools/peg_generator #138282

gh-138281: Run ruff on Tools/peg_generator #138282

Conversation

sobolevn commented Aug 31, 2025 • edited by bedevere-app bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

vstinner commented Sep 3, 2025

Uh oh!

sobolevn commented Sep 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

hugovk Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

pablogsal Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

sobolevn Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

vstinner left a comment

Choose a reason for hiding this comment

Uh oh!

vstinner Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

miss-islington-app bot commented Sep 3, 2025

Uh oh!

miss-islington-app bot commented Sep 3, 2025

Uh oh!

miss-islington-app bot commented Sep 3, 2025

Uh oh!

sobolevn commented Sep 3, 2025

Uh oh!

bedevere-app bot commented Sep 3, 2025

Uh oh!

bedevere-app bot commented Sep 3, 2025

Uh oh!

Uh oh!

gh-138281: Run `ruff` on `Tools/peg_generator` #138282

gh-138281: Run `ruff` on `Tools/peg_generator` #138282

sobolevn commented Aug 31, 2025 •

edited by bedevere-app bot

Loading

sobolevn commented Sep 3, 2025 •

edited

Loading