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

[3.8] bpo-39031: Include elif keyword when producing lineno/col-offset info for if_stmt (GH-17582) #17589

Merged
merged 1 commit into from Dec 13, 2019

Conversation

@miss-islington
Copy link

miss-islington commented Dec 13, 2019

When parsing an "elif" node, lineno and col_offset of the node now point to the "elif" keyword and not to its condition, making it consistent with the "if" node.

https://bugs.python.org/issue39031

Automerge-Triggered-By: @pablogsal
(cherry picked from commit 025a602)

Co-authored-by: Lysandros Nikolaou lisandrosnik@gmail.com

https://bugs.python.org/issue39031

… for if_stmt (GH-17582)

When parsing an "elif" node, lineno and col_offset of the node now point to the "elif" keyword and not to its condition, making it consistent with the "if" node.

https://bugs.python.org/issue39031

Automerge-Triggered-By: @pablogsal
(cherry picked from commit 025a602)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
@miss-islington

This comment has been minimized.

Copy link
Author

miss-islington commented Dec 13, 2019

@lysnikolaou: Status check is done, and it's a failure .

@lysnikolaou

This comment has been minimized.

Copy link
Contributor

lysnikolaou commented Dec 13, 2019

@pablogsal Can we merge this? I kind of need this change in 3.8 for gvanrossum/pegen#107.

@pablogsal pablogsal merged commit 3b18b17 into python:3.8 Dec 13, 2019
4 of 5 checks passed
4 of 5 checks passed
continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
Azure Pipelines PR #20191213.10 succeeded
Details
bedevere/issue-number Issue number 39031 found
Details
bedevere/maintenance-branch-pr Valid maintenance branch PR title.
bedevere/news News entry found in Misc/NEWS.d
@pablogsal

This comment has been minimized.

Copy link
Member

pablogsal commented Dec 13, 2019

Done, but notice that this won't be in the official 3.8 build until the new patch version is released.

@miss-islington miss-islington deleted the miss-islington:backport-025a602-3.8 branch Dec 13, 2019
@lysnikolaou

This comment has been minimized.

Copy link
Contributor

lysnikolaou commented Dec 13, 2019

Yeah, I know. Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.