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

bpo-41119: Output correct error message for list/tuple followed by colon #21160

Merged
merged 1 commit into from
Jun 25, 2020

Conversation

lysnikolaou
Copy link
Contributor

@lysnikolaou lysnikolaou commented Jun 25, 2020

Copy link
Member

@pablogsal pablogsal left a comment

Choose a reason for hiding this comment

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

LGTM

@pablogsal pablogsal merged commit 4b85e60 into python:master Jun 25, 2020
@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

Sorry, @lysnikolaou and @pablogsal, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 4b85e60601489f9ee9dd2909e28d89a31566887c 3.9

@pablogsal
Copy link
Member

Sorry, @lysnikolaou and @pablogsal, I could not cleanly backport this to 3.9 due to a conflict.

The era of automatic backports is over :(

@pablogsal
Copy link
Member

pablogsal commented Jun 26, 2020

@lysnikolaou Could you make the backport using cherry_picker?

@lysnikolaou
Copy link
Contributor Author

@lysnikolaou Could you make the backport using cherry_picker?

Yup, I'll do it a bit later today.

@lysnikolaou
Copy link
Contributor Author

Sorry, @lysnikolaou and @pablogsal, I could not cleanly backport this to 3.9 due to a conflict.

The era of automatic backports is over :(

I guess that's because of the different filenames?

@pablogsal
Copy link
Member

I guess that's because of the different filenames?

Not really, my git was smart enough to do the remapping in previous backports

@lysnikolaou
Copy link
Contributor Author

I guess that's because of the different filenames?

Not really, my git was smart enough to do the remapping in previous backports

Yes, but Parser/parser.c existed in previous versions as well, right?

@pablogsal
Copy link
Member

I guess that's because of the different filenames?

Not really, my git was smart enough to do the remapping in previous backports

Yes, but Parser/parser.c existed in previous versions as well, right?

Yep, but git knows the story of that file, the same way it will do if you do git log FILE --follow: it will only show you the story of FILE across renames even if it substituted some other file that had the same name before (there is an heuristic that you can tune for when git thinks you delete + create Vs when it thinks you modified).

@lysnikolaou
Copy link
Contributor Author

Oh okay, didn't know that.

@lysnikolaou lysnikolaou deleted the annotation-error-message branch June 26, 2020 20:29
lysnikolaou added a commit to lysnikolaou/cpython that referenced this pull request Jun 26, 2020
@bedevere-bot
Copy link

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

@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label Jun 26, 2020
pablogsal pushed a commit that referenced this pull request Jun 26, 2020
fasih pushed a commit to fasih/cpython that referenced this pull request Jun 29, 2020
arun-mani-j pushed a commit to arun-mani-j/cpython that referenced this pull request Jul 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants