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.

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

gh-94192: Fix error for dictionary literals with invalid expression as value. #94304

Merged
merged 2 commits into from
Jun 26, 2022

Conversation

wookie184
Copy link
Contributor

Closes #94192

I just added &('}'|',') which is the same as what was already done on line 1312. I couldn't think of any cases this makes worse and the existing tests seemed to run the same so I think this should be fine.

@wookie184
Copy link
Contributor Author

Should've run patchcheck 😅

@pablogsal
Copy link
Member

Thanks a lot for the PR @wookie184 ♥️

@pablogsal pablogsal merged commit 8c237a7 into python:main Jun 26, 2022
@miss-islington
Copy link
Contributor

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 26, 2022
…sion as value. (pythonGH-94304)

* Fix error for dictionary literals with invalid expression as value.

* Remove trailing whitespace
(cherry picked from commit 8c237a7)

Co-authored-by: wookie184 <[email protected]>
@miss-islington
Copy link
Contributor

Sorry, @wookie184 and @pablogsal, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 8c237a7a71d52f996f58dc58f6b6ce558d209494 3.10

@bedevere-bot
Copy link

GH-94308 is a backport of this pull request to the 3.11 branch.

@pablogsal
Copy link
Member

@wookie184 Can you do the backport to 3.10 using cherry-picker?

miss-islington added a commit that referenced this pull request Jun 26, 2022
…s value. (GH-94304)

* Fix error for dictionary literals with invalid expression as value.

* Remove trailing whitespace
(cherry picked from commit 8c237a7)

Co-authored-by: wookie184 <[email protected]>
wookie184 added a commit to wookie184/cpython that referenced this pull request Jun 27, 2022
… expression as value. (pythonGH-94304)

* Fix error for dictionary literals with invalid expression as value.

* Remove trailing whitespace.
(cherry picked from commit 8c237a7)

Co-authored-by: wookie184 <[email protected]>
@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Jun 27, 2022
@bedevere-bot
Copy link

GH-94344 is a backport of this pull request to the 3.10 branch.

pablogsal pushed a commit that referenced this pull request Jun 27, 2022
@wookie184 wookie184 deleted the fix-dict-error branch June 27, 2022 18:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

A SyntaxError less detailed since 3.10 in specific example
4 participants