Skip to content

gh-132661: Disallow Template/str concatenation after PEP 750 spec update #135996

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 36 commits into from
Jul 21, 2025
Merged

gh-132661: Disallow Template/str concatenation after PEP 750 spec update #135996

merged 36 commits into from
Jul 21, 2025
+1,405 −1,441

Conversation

davepeck
Copy link
Contributor

@davepeck davepeck commented Jun 26, 2025 •
edited
Loading

Following the steering council decision and corresponding update to PEP750, we are removing support for both implicit and explicit Template/str concatenation.

@bedevere-app bedevere-app bot mentioned this pull request Jun 26, 2025
Open
sobolevn
sobolevn reviewed Jun 26, 2025
View reviewed changes
Copy link
Member

@sobolevn sobolevn left a comment

Choose a reason for hiding this comment

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

Thank you!

@lysnikolaou
Copy link
Member

Happy to do this with your input, or happy to hand it off to you!

Happy to help out / review this PR if you wanna take a stab at it. Feel free to reach out if you have any specific questions.

@dylwil3 dylwil3 mentioned this pull request Jul 4, 2025
Merged
@davepeck davepeck marked this pull request as ready for review July 8, 2025 23:27
@davepeck
Copy link
Contributor Author

davepeck commented Jul 8, 2025

@lysnikolaou Think this is ready. The only question for me is whether we want to go further with _PyPegen_concatenate_strings().

sobolevn
sobolevn reviewed Jul 9, 2025
View reviewed changes
Copy link
Member

@sobolevn sobolevn left a comment

Choose a reason for hiding this comment

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

Thank you! Several small nitpicks :)

lysnikolaou
lysnikolaou requested changes Jul 9, 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.

Thanks @davepeck for working on this! Looks great in general. Left a few unimportant comments and one more significant one about how to implement this in the parser. Also, we'll need to change ast_unparse.c around https://github.com/python/cpython/blob/main/Python/ast_unparse.c#L715.

@davepeck
Copy link
Contributor Author

davepeck commented Jul 15, 2025 •
edited
Loading

Looks even better this time. Thanks @davepeck! Left a few comments inline again. It'll probably be good to go once these are addressed.

👍 Thanks, @lysnikolaou for all your patience and help here -- think I took care of the rest.

efimov-mikhail
efimov-mikhail reviewed Jul 16, 2025
View reviewed changes
efimov-mikhail
efimov-mikhail reviewed Jul 16, 2025
View reviewed changes
@efimov-mikhail
Copy link
Contributor

LGTM

@lysnikolaou
Copy link
Member

Looks great and aaalmost there. I have one last thing I missed during my previous reviews.

If I remember correctly, https://github.com/python/cpython/blob/main/Python/codegen.c#L4084-L4093 can be removed as well, because it's only there to handle FormattedValues, which cannot happen anymore.

After that, it's gonna be good to go, promise!

@davepeck
Copy link
Contributor Author

davepeck commented Jul 17, 2025 •
edited
Loading

If I remember correctly, https://github.com/python/cpython/blob/main/Python/codegen.c#L4084-L4093 can be removed as well, because it's only there to handle FormattedValues, which cannot happen anymore.

@lysnikolaou Ah, yes -- thank you. Removed now; tests continue to pass.

(If we prefer, I can replace VISIT() in the else block with a direct ADDOP_LOAD_CONST(). I'd probably add an assert(value->kind == Constant_kind) there, too.)

lysnikolaou
lysnikolaou approved these changes Jul 21, 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.

Looks good to me! Thanks @davepeck! Great work.

@lysnikolaou lysnikolaou added the needs backport to 3.14 bugs and security fixes label Jul 21, 2025
@lysnikolaou lysnikolaou merged commit c5e77af into python:main Jul 21, 2025
46 of 47 checks passed
@miss-islington-app
Copy link

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

@lysnikolaou lysnikolaou deleted the pep750-concat-update branch July 21, 2025 06:44
@miss-islington-app
Copy link

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

cherry_picker c5e77af131aa0c8832a9ee50c4410731254e4209 3.14

@lysnikolaou
Copy link
Member

I can handle tha backport.

lysnikolaou added a commit to lysnikolaou/cpython that referenced this pull request Jul 21, 2025
@davepeck @sobolevn @lysnikolaou
pythongh-132661: Disallow Template/str concatenation after PEP 75…
9ef8d31 
…0 spec update (python#135996)

Co-authored-by: sobolevn <mail@sobolevn.me>
Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
(cherry picked from commit c5e77af)
lysnikolaou added a commit that referenced this pull request Jul 21, 2025
@lysnikolaou @davepeck @sobolevn
[3.14] gh-132661: Disallow Template/str concatenation after PEP 7…
af8d1f5 
…50 spec update (#135996) (#136901)

Co-authored-by: Dave Peck <davepeck@gmail.com>
Co-authored-by: sobolevn <mail@sobolevn.me>
@dylwil3 dylwil3 mentioned this pull request Jul 25, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sobolevn sobolevn sobolevn left review comments

@efimov-mikhail efimov-mikhail efimov-mikhail left review comments

@lysnikolaou lysnikolaou lysnikolaou approved these changes

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

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

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

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

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

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

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

Assignees

@lysnikolaou lysnikolaou

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

Successfully merging this pull request may close these issues.
6 participants
@davepeck @lysnikolaou @pablogsal @efimov-mikhail @JelleZijlstra @sobolevn
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy