Skip to content

gh-135148: Correctly handle f/t strings with comments and debug expressions #135198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
Jul 16, 2025
Merged

gh-135148: Correctly handle f/t strings with comments and debug expressions #135198

merged 4 commits into from
Jul 16, 2025
+83 −20

Conversation

pablogsal
Copy link
Member

@pablogsal pablogsal commented Jun 6, 2025 •
edited by bedevere-app bot
Loading

@pablogsal pablogsal requested a review from lysnikolaou as a code owner June 6, 2025 01:18
@bedevere-app bedevere-app bot mentioned this pull request Jun 6, 2025
Open
@pablogsal pablogsal force-pushed the gh-135148 branch 2 times, most recently from bd49471 to 5f8456e Compare June 6, 2025 01:22
pablogsal
pablogsal commented Jun 6, 2025
View reviewed changes
Parser/lexer/lexer.c Outdated

// Process each character of input
Copy link
Member Author

Choose a reason for hiding this comment

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

@lysnikolaou please read this carefully. I am mostly sure its correct but it really needs some extra eyes

@Wulian233 Wulian233 mentioned this pull request Jun 6, 2025
Merged
lysnikolaou
lysnikolaou requested changes Jun 6, 2025
View reviewed changes
Copy link
Member

@lysnikolaou lysnikolaou left a comment

Choose a reason for hiding this comment

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

Yeah, I was thinking something very similar as a solution, too! I found one problem, but it looks good otherwise.

@bedevere-app
Copy link

bedevere-app bot commented Jun 6, 2025

When you're done making the requested changes, leave the comment: I have made the requested changes; please review again.

lysnikolaou
lysnikolaou reviewed Jun 9, 2025
View reviewed changes
Copy link
Member

@lysnikolaou lysnikolaou left a comment •
edited
Loading

Choose a reason for hiding this comment

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

This looks good now! Thanks @pablogsal!

I left a couple of inline comments for some very minor improvements.

Parser/lexer/lexer.c
Comment on lines +141 to +147
if (!in_string) {
in_string = 1;
quote_char = ch;
}
else if (ch == quote_char) {
in_string = 0;
}
Copy link
Member

Choose a reason for hiding this comment

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

This only works because there's always an odd number of quotes in a STRING token and we're sure that all STRING tokens will be valid at this point. Maybe add a comment to explain that?

Parser/lexer/lexer.c Outdated
Comment on lines 127 to 128
char quote_char = 0;
char string_quote = 0;
Copy link
Member

Choose a reason for hiding this comment

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

Do we need both of these?

@lysnikolaou
Copy link
Member

@pablogsal Ping here. Will we be able to get thins into 3.13 before the rc release? If you don't have time to work on it, I'm okay taking it over.

@pablogsal
Copy link
Member Author

I am travelling today :( If you want and have the time you can push the fixes to the PR and land it but if you don't have time maybe I can get to it at night.

lysnikolaou
lysnikolaou approved these changes Jul 16, 2025
View reviewed changes
Copy link
Member

@lysnikolaou lysnikolaou left a comment

Choose a reason for hiding this comment

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

Pushed a commit with a couple of additions. LGTM now! Let's merge it.

@pablogsal pablogsal merged commit ef66fb5 into python:main Jul 16, 2025
44 of 45 checks passed
@pablogsal pablogsal deleted the gh-135148 branch July 16, 2025 09:47
@lysnikolaou
Copy link
Member

Are we backporting this?

@pablogsal
Copy link
Member Author

We should indeed

@pablogsal pablogsal added needs backport to 3.13 bugs and security fixes needs backport to 3.14 bugs and security fixes labels Jul 16, 2025
@miss-islington-app
Copy link

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

@miss-islington-app
Copy link

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

@miss-islington-app
Copy link

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

cherry_picker ef66fb597ba909ead2fbfc06f748aa7b7e9ea437 3.13

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 16, 2025
@pablogsal @miss-islington
pythongh-135148: Correctly handle f/t strings with comments and debug…
c08f2ab 
… expressions (pythonGH-135198)

(cherry picked from commit ef66fb5)

Co-authored-by: Pablo Galindo Salgado <[email protected]>
@bedevere-app
Copy link

bedevere-app bot commented Jul 16, 2025

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

@bedevere-app bedevere-app bot removed the needs backport to 3.14 bugs and security fixes label Jul 16, 2025
pablogsal pushed a commit that referenced this pull request Jul 16, 2025
@miss-islington
[3.14] gh-135148: Correctly handle f/t strings with comments and debu…
9bf3464 
…g expressions (GH-135198) (#136720)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lysnikolaou lysnikolaou lysnikolaou approved these changes

Assignees

@pablogsal pablogsal

Labels
needs backport to 3.13 bugs and security fixes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@pablogsal @lysnikolaou