gh-132661: Disallow Template/str concatenation after PEP 750 spec update
#135996
+32
−149
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sobolevn
reviewed
Jun 26, 2025
| @@ -1902,6 +1907,7 @@ _PyPegen_concatenate_strings(Parser *p, asdl_expr_seq *strings, | |||
| } | |||
| } | |||
|
|
|||
|
|
|||
| Py_TYPE(right)->tp_name); | ||
| return NULL; | ||
| } | ||
| PyErr_Format(PyExc_TypeError, |
There was a problem hiding this comment.
You can use %T to format object's type.
There was a problem hiding this comment.
The diff here is just a dedent of existing code; I was hesitant to change anything else. But happy to update it to use %T if we'd prefer.
| combined = t1 + ", world" | ||
| self.assertTStringEqual(combined, ("Hello, world",), ()) | ||
| self.assertEqual(fstring(combined), "Hello, world") | ||
| with self.assertRaises(TypeError): |
There was a problem hiding this comment.
Will it make sense to check error message here?
There was a problem hiding this comment.
Good catch, will update.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Following the steering council decision and corresponding update to PEP750, we are removing support for both implicit and explicit
Template/strconcatenation.@lysnikolaou I took a first pass at this, but it's still just a draft. I deleted the obvious code and updated our tests. But there's still more to clean up, both in
action_helpers.c/_PyPegen_concatenate_strings(I just raised a syntax error if templates/non-templates were mixed, rather than cleaning up code that now supports more than it needs to), and probably in_ast_unparse.pyamongst others. Happy to do this with your input, or happy to hand it off to you!