Skip to content
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

gh-131649: fix test_string_literals SyntaxWarning #131650

Merged
merged 1 commit into from
Mar 26, 2025
Merged

gh-131649: fix test_string_literals SyntaxWarning #131650

merged 1 commit into from
Mar 26, 2025

Conversation

graingert
Copy link
Contributor

@graingert graingert commented Mar 24, 2025 •
edited by bedevere-app bot
Loading

@bedevere-app bedevere-app bot added the tests Tests in the Lib/test dir label Mar 24, 2025
@bedevere-app bedevere-app bot mentioned this pull request Mar 24, 2025
Closed
@graingert graingert added skip news needs backport to 3.12 bug and security fixes needs backport to 3.13 bugs and security fixes labels Mar 24, 2025
@graingert graingert requested a review from pablogsal March 24, 2025 08:15
@graingert graingert marked this pull request as ready for review March 24, 2025 08:15
@graingert graingert force-pushed the fix-test-string-literals-syntax-warning branch from 22cee3c to 0c73ffe Compare March 24, 2025 08:18
vstinner
vstinner reviewed Mar 25, 2025
View reviewed changes
Lib/test/test_string_literals.py
@@ -177,7 +177,7 @@ def test_eval_str_invalid_octal_escape(self):
def test_invalid_escape_locations_with_offset(self):
with warnings.catch_warnings(record=True) as w:
warnings.simplefilter('always', category=SyntaxWarning)
eval("\"'''''''''''''''''''''invalid\ Escape\"")
eval("\"'''''''''''''''''''''invalid\\ Escape\"")
Copy link
Member

Choose a reason for hiding this comment

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

Isn't the purpose of the test to emit a SyntaxWarning warning?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, but only when evaluated (which it still does). The eval here is intended to hide the SyntaxWarning from the interpreter at import, but it wasn't applied correctly

Copy link
Member

@vstinner vstinner Mar 25, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Oh, that's confusing :-) But you're right, currently the code emits the warning when the code is compiled, not when eval() is called.

vstinner
vstinner approved these changes Mar 25, 2025
View reviewed changes
Copy link
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

cc @serhiy-storchaka

Lib/test/test_string_literals.py
@@ -177,7 +177,7 @@ def test_eval_str_invalid_octal_escape(self):
def test_invalid_escape_locations_with_offset(self):
with warnings.catch_warnings(record=True) as w:
warnings.simplefilter('always', category=SyntaxWarning)
eval("\"'''''''''''''''''''''invalid\ Escape\"")
eval("\"'''''''''''''''''''''invalid\\ Escape\"")
Copy link
Member

@vstinner vstinner Mar 25, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Oh, that's confusing :-) But you're right, currently the code emits the warning when the code is compiled, not when eval() is called.

serhiy-storchaka
serhiy-storchaka approved these changes Mar 26, 2025
View reviewed changes
Copy link
Member

@serhiy-storchaka serhiy-storchaka 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 2d83891 into python:main Mar 26, 2025
42 checks passed
@miss-islington-app
Copy link

Thanks @graingert for the PR, and @vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13.
🐍🍒⛏🤖

@miss-islington-app
Copy link

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

cherry_picker 2d83891dfd51f595de68b0336b3bfc876f7b2507 3.13

@miss-islington-app
Copy link

Sorry, @graingert and @vstinner, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 2d83891dfd51f595de68b0336b3bfc876f7b2507 3.12

@vstinner
Copy link
Member

Merged, thanks for the fix.

@graingert: Automated backports to 3.12 and 3.13 failed (with conflicts?). Do you want to attempt to backport your change manually?

@graingert graingert deleted the fix-test-string-literals-syntax-warning branch March 26, 2025 14:11
@brianschubert
Copy link
Contributor

I took a look at the conflicts. The test boilerplate changed, but the tests strings are the same, so the backport should be as simple as just adding an extra \ as was done here. I'd be happy to give it go unless someone else is

brianschubert pushed a commit to brianschubert/cpython that referenced this pull request Mar 26, 2025
@graingert @brianschubert
[3.13] pythongh-131649: fix test_string_literals SyntaxWarning (pytho…
03791d5 
…nGH-131650)

(cherry picked from commit 2d83891)

Co-authored-by: Thomas Grainger <[email protected]>
@graingert
Copy link
Contributor Author

I took a look at the conflicts. The test boilerplate changed, but the tests strings are the same, so the backport should be as simple as just adding an extra \ as was done here. I'd be happy to give it go unless someone else is

Thanks that would be great!

@bedevere-app
Copy link

bedevere-app bot commented Mar 26, 2025

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

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Mar 26, 2025
vstinner pushed a commit that referenced this pull request Mar 26, 2025
@brianschubert @graingert
[3.13] gh-131649: fix test_string_literals SyntaxWarning (GH-131650) (#…
5bcb476 
…131766)

(cherry picked from commit 2d83891)

Co-authored-by: Thomas Grainger <[email protected]>
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 26, 2025
@brianschubert @graingert @miss-islington
[3.13] pythongh-131649: fix test_string_literals SyntaxWarning (pytho…
75d31d4 
…nGH-131650) (pythonGH-131766)

(cherry picked from commit 2d83891)
(cherry picked from commit 5bcb476)

Co-authored-by: Brian Schubert <[email protected]>
Co-authored-by: Thomas Grainger <[email protected]>
vstinner pushed a commit that referenced this pull request Mar 26, 2025
@miss-islington @brianschubert @graingert
[3.12] gh-131649: fix test_string_literals SyntaxWarning (GH-131650) (G…
1826347 
…H-131766) (#131772)

[3.13] gh-131649: fix test_string_literals SyntaxWarning (GH-131650) (GH-131766)

(cherry picked from commit 2d83891)
(cherry picked from commit 5bcb476)

Co-authored-by: Brian Schubert <[email protected]>
Co-authored-by: Thomas Grainger <[email protected]>
diegorusso pushed a commit to diegorusso/cpython that referenced this pull request Apr 1, 2025
@graingert @diegorusso
pythongh-131649: fix test_string_literals SyntaxWarning (python#131650)
d30a0e6
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

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

@pablogsal pablogsal Awaiting requested review from pablogsal

Assignees

@vstinner vstinner

Labels
needs backport to 3.12 bug and security fixes skip news tests Tests in the Lib/test dir
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@graingert @vstinner @brianschubert @serhiy-storchaka