Skip to content

bpo-40614: Respect feature version for f-string debug expressions#20196

Merged
pablogsal merged 7 commits intopython:masterfrom
hauntsaninja:fstringeq
May 27, 2020
Merged

bpo-40614: Respect feature version for f-string debug expressions#20196
pablogsal merged 7 commits intopython:masterfrom
hauntsaninja:fstringeq

Conversation

@hauntsaninja
Copy link
Contributor

@hauntsaninja hauntsaninja commented May 18, 2020 •
edited by bedevere-bot
Loading

@hauntsaninja hauntsaninja requested a review from pablogsal as a code owner May 18, 2020 22:38
@lysnikolaou
Copy link
Member

lysnikolaou commented May 18, 2020

@pablogsal If this is okay, I guess we should also change the old parser to do this and backport that to 3.8 as well?

@pablogsal
Copy link
Member

pablogsal commented May 19, 2020

I guess we should also change the old parser to do this and backport that to 3.8 as well?

Yeah, but the backport should be done manually to not include the parts for the new parser.

lysnikolaou
lysnikolaou reviewed May 19, 2020
View reviewed changes
Parser/pegen/parse_string.c
Comment on lines +935 to +936
RAISE_SYNTAX_ERROR("f-string: self documenting expressions are "
"only supported in Python 3.8 and greater");
Copy link
Member

@lysnikolaou lysnikolaou May 19, 2020

Choose a reason for hiding this comment

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

Feel free to ignore this. (Note that if you don't the message should be changed in the old parser as well)

Suggested change
RAISE_SYNTAX_ERROR("f-string: self documenting expressions are "
"only supported in Python 3.8 and greater");
RAISE_SYNTAX_ERROR("Self-documenting expressions in f-strings are "
"only supported in Python 3.8 and greater");

Copy link
Contributor Author

@hauntsaninja hauntsaninja May 19, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Thanks! All the other f-string SyntaxErrors start with "f-string: ", so I think it's good to stay consistent.

Copy link
Member

@lysnikolaou lysnikolaou May 19, 2020

Choose a reason for hiding this comment

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

Oh okay, didn't remember correctly then.

hauntsaninja and others added 2 commits May 18, 2020 17:23
@hauntsaninja @lysnikolaou
Update Lib/test/test_ast.py
68111be 
Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
@hauntsaninja @lysnikolaou
Update Misc/NEWS.d/next/Library/2020-05-18-22-41-02.bpo-40614.8j3kmq.rst
e6a76a1 
Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
@hauntsaninja
Copy link
Contributor Author

hauntsaninja commented May 19, 2020

Happy to open a PR with a manual backport using cherry_picker if this gets merged!

lysnikolaou
lysnikolaou approved these changes May 19, 2020
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.

Thanks!

@hauntsaninja
Copy link
Contributor Author

hauntsaninja commented May 19, 2020

Should that label be "needs backport to 3.8"?

@lysnikolaou
Copy link
Member

lysnikolaou commented May 19, 2020 •
edited
Loading

Nope, master is 3.10 as of about 3 hours ago. This needs to be backported to 3.9 as-is and then the change to the old parser should also be manually backported to 3.8.

@lysnikolaou lysnikolaou requested review from pablogsal and removed request for pablogsal May 24, 2020 10:16
@pablogsal pablogsal merged commit c116c94 into python:master May 27, 2020
@miss-islington
Copy link
Contributor

miss-islington commented May 27, 2020

Thanks @hauntsaninja for the PR, and @pablogsal for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

miss-islington commented May 27, 2020

Sorry @hauntsaninja and @pablogsal, I had trouble checking out the 3.9 backport branch.
Please backport using cherry_picker on command line.
cherry_picker c116c94ff119485761460f1033cdee425bed0310 3.9

@hauntsaninja hauntsaninja deleted the fstringeq branch May 27, 2020 20:30
pablogsal pushed a commit to pablogsal/cpython that referenced this pull request May 27, 2020
@hauntsaninja @pablogsal
[3.9] bpo-40614: Respect feature version for f-string debug expressio…
be88304 
…ns (pythonGH-20196)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
(cherry picked from commit c116c94)

Co-authored-by: Shantanu <hauntsaninja@users.noreply.github.com>
@bedevere-bot
Copy link

bedevere-bot commented May 27, 2020

GH-20464 is a backport of this pull request to the 3.9 branch.

hauntsaninja added a commit to hauntsaninja/cpython that referenced this pull request May 27, 2020
@hauntsaninja @lysnikolaou @pablogsal
bpo-40614: Respect feature version for f-string debug expressions (py…
097c79e 
…thonGH-20196)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
(cherry picked from commit c116c94)
@hauntsaninja hauntsaninja mentioned this pull request May 27, 2020
Merged
@hauntsaninja
Copy link
Contributor Author

hauntsaninja commented May 27, 2020

Opened a backport to 3.8 in #20466

pablogsal added a commit that referenced this pull request May 27, 2020
@pablogsal @hauntsaninja
[3.9] bpo-40614: Respect feature version for f-string debug expressio…
9b83829 
…ns (GH-20196) (GH-20464)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
(cherry picked from commit c116c94)

Co-authored-by: Shantanu <hauntsaninja@users.noreply.github.com>
pablogsal added a commit that referenced this pull request Jun 6, 2020
@hauntsaninja @lysnikolaou @pablogsal
bpo-40614: Respect feature version for f-string debug expressions (GH…
f7ed4d4 
…-20196) (GH-20466)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
(cherry picked from commit c116c94)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pablogsal pablogsal pablogsal approved these changes

@lysnikolaou lysnikolaou lysnikolaou approved these changes

Assignees

@pablogsal pablogsal

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@hauntsaninja @lysnikolaou @pablogsal @miss-islington @bedevere-bot @the-knights-who-say-ni