Skip to content

[3.13] gh-146615: Fix format specifiers in Objects/ directory (GH-146620) #147705

Merged
vstinner merged 3 commits intopython:3.13from
sunmy2019:gh-146615-7
Apr 1, 2026
Merged

[3.13] gh-146615: Fix format specifiers in Objects/ directory (GH-146620) #147705
vstinner merged 3 commits intopython:3.13from
sunmy2019:gh-146615-7

Conversation

@sunmy2019
Copy link
Copy Markdown
Member

@sunmy2019 sunmy2019 commented Mar 31, 2026 •
edited by bedevere-app bot
Loading

I found a new error specific to 3.13.

cpython/Parser/lexer/lexer.c

Lines 1107 to 1110 in fc1c644

if (the_current_tok->f_string_quote == quote &&
the_current_tok->f_string_quote_size == quote_size) {
return MAKE_TOKEN(_PyTokenizer_syntaxerror(tok, "f-string: expecting '}'", start));
} 

-      return MAKE_TOKEN(_PyTokenizer_syntaxerror(tok, "f-string: expecting '}'", start));
+      return MAKE_TOKEN(_PyTokenizer_syntaxerror(tok, "f-string: expecting '}'"));

This is fixed by 6020260 in 3.14.

@bedevere-app bedevere-app bot mentioned this pull request Mar 31, 2026
Open
@bedevere-app bedevere-app bot mentioned this pull request Mar 31, 2026
Merged
vstinner
vstinner reviewed Apr 1, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. i is declared as an int.

@vstinner
Copy link
Copy Markdown
Member

vstinner commented Apr 1, 2026

Hum. Your PR description described a bug which is not fixed by the PR. It's misleading.

Do you plan to integrate a fix for return MAKE_TOKEN(_PyTokenizer_syntaxerror(tok, "f-string: expecting '}'", start)); in this PR?

@sunmy2019
Copy link
Copy Markdown
Member Author

sunmy2019 commented Apr 1, 2026

Do you plan to integrate a fix for return MAKE_TOKEN(_PyTokenizer_syntaxerror(tok, "f-string: expecting '}'", start)); in this PR?

I’m not sure if I should fix it within this PR or address it in a separate one. What do you think?

@vstinner
Copy link
Copy Markdown
Member

vstinner commented Apr 1, 2026

You can update this PR to fix also the _PyTokenizer_syntaxerror() issue.

@sunmy2019
Copy link
Copy Markdown
Member Author

sunmy2019 commented Apr 1, 2026

Done

@vstinner vstinner enabled auto-merge (squash) April 1, 2026 21:30
vstinner
vstinner approved these changes Apr 1, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@vstinner vstinner merged commit c0eae2a into python:3.13 Apr 1, 2026
42 checks passed
@vstinner
Copy link
Copy Markdown
Member

vstinner commented Apr 1, 2026

Merged, thanks for fixes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vstinner vstinner vstinner approved these changes

@pablogsal pablogsal Awaiting requested review from pablogsal pablogsal is a code owner

@lysnikolaou lysnikolaou Awaiting requested review from lysnikolaou lysnikolaou is a code owner

Assignees

No one assigned

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@sunmy2019 @vstinner