Skip to content

/cpython

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-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
+11 −2

Conversation

@lysnikolaou
Copy link
Contributor

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

Related to #17582, where this was left out.

https://bugs.python.org/issue39031
@lysnikolaou
Fix elif start column offset when there is an else following
Loading status checks…
91abb5b
@pablogsal pablogsal added the skip news label Dec 14, 2019
@pablogsal
pablogsal approved these changes Dec 14, 2019
View changes
@pablogsal pablogsal merged commit 5936a4c into python:master Dec 14, 2019
4 checks passed
4 checks passed
Azure Pipelines PR #20191214.6 succeeded
Details
bedevere/issue-number Issue number 39031 found
Details
bedevere/news "skip news" label found
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@miss-islington

This comment has been minimized.

Sign in to view
Copy link

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 added 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

This comment has been minimized.

Sign in to view
Copy link

bedevere-bot commented Dec 14, 2019

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

This comment has been minimized.

Sign in to view
Copy link

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 added 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…
Verified
This commit was signed with a verified signature.
pablogsal Pablo Galindo
GPG key ID: FFE87404168BD847 Learn about signing commits
1c682e4 
…ythonGH-17596).

(cherry picked from commit 5936a4c)

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

This comment has been minimized.

Sign in to view
Copy link

bedevere-bot commented Dec 14, 2019

GH-17601 is a backport of this pull request to the 3.7 branch.
pablogsal added 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)…
Loading status checks…
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…
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
4b75466 
…H-17596) (GH-17601)

(cherry picked from commit 5936a4c)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
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
CLA signed skip news
Projects
None yet
Milestone
No milestone
5 participants
@lysnikolaou @miss-islington @bedevere-bot @pablogsal @the-knights-who-say-ni
You can’t perform that action at this time.