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

Jump to bottom

bpo-39031: Fix elif start column offset when there is an else following #17596

Merged
merged 1 commit into from Dec 14, 2019
Merged

bpo-39031: Fix elif start column offset when there is an else following #17596

merged 1 commit into from Dec 14, 2019

Conversation

lysnikolaou
Copy link
Contributor

@lysnikolaou lysnikolaou commented Dec 14, 2019 •
edited by bedevere-bot

Related to #17582, where this was left out.

https://bugs.python.org/issue39031

@pablogsal pablogsal merged commit 5936a4c into python:master Dec 14, 2019
@miss-islington
Copy link
Contributor

miss-islington commented Dec 14, 2019

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Dec 14, 2019
@lysnikolaou @miss-islington
Fix elif start column offset when there is an else following (pythonG…
9635d44 
…H-17596)

(cherry picked from commit 5936a4c)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
@bedevere-bot
Copy link

bedevere-bot commented Dec 14, 2019

GH-17600 is a backport of this pull request to the 3.8 branch.

@miss-islington
Copy link
Contributor

miss-islington commented Dec 14, 2019

Sorry, @lysnikolaou and @pablogsal, I could not cleanly backport this to 3.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 5936a4ce914d42af97b9238e5090dedc8d5b0bd2 3.7

pablogsal pushed a commit to pablogsal/cpython that referenced this pull request Dec 14, 2019
@lysnikolaou @pablogsal
[3.7] Fix elif start column offset when there is an else following (p…
1c682e4 
…ythonGH-17596).

(cherry picked from commit 5936a4c)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
@bedevere-bot
Copy link

bedevere-bot commented Dec 14, 2019

GH-17601 is a backport of this pull request to the 3.7 branch.

pablogsal pushed a commit that referenced this pull request Dec 14, 2019
@miss-islington @lysnikolaou @pablogsal
Fix elif start column offset when there is an else following (GH-17596)…
ce333cd 
… (GH-17600)

(cherry picked from commit 5936a4c)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
pablogsal added a commit that referenced this pull request Dec 14, 2019
@pablogsal @lysnikolaou
[3.7] Fix elif start column offset when there is an else following (G…
4b75466 
…H-17596) (GH-17601)

(cherry picked from commit 5936a4c)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
shihai1991 pushed a commit to shihai1991/cpython that referenced this pull request Jan 31, 2020
@lysnikolaou @shihai1991
Fix elif start column offset when there is an else following (pythonG…
47895c6 
…H-17596)
@lysnikolaou lysnikolaou deleted the elif-else-fix branch May 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pablogsal pablogsal

Assignees

@pablogsal pablogsal

Labels
skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@lysnikolaou @miss-islington @bedevere-bot @pablogsal @the-knights-who-say-ni