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-39114: Fix handling of line numbers around finally-blocks. #17737

Merged
merged 1 commit into from Dec 30, 2019
Merged

bpo-39114: Fix handling of line numbers around finally-blocks. #17737

merged 1 commit into from Dec 30, 2019
+1,692 −1,622

Conversation

@markshannon
Copy link
Contributor

markshannon commented Dec 29, 2019 •
edited by bedevere-bot

Restores the line number after emitting the code for a finally block.

https://bugs.python.org/issue39114
@pablogsal

This comment has been minimized.

Sign in to view
Copy link
Member

pablogsal commented Dec 29, 2019 •
edited

You need to regenerate the frozen importlib and other frozen stuff, no? (make regen-all to make sure).
@markshannon
Fix handling of line numbers around finally-blocks.
Loading status checks…
f254546
@markshannon markshannon force-pushed the markshannon:fix-linenumbers-around-finallly-blocks branch from f3b9fbe to f254546 Dec 29, 2019
@pablogsal pablogsal self-requested a review Dec 29, 2019
@pablogsal
pablogsal approved these changes Dec 29, 2019
View changes
Copy link
Member

pablogsal left a comment

Looks good to me. Thanks for the fix!
@markshannon markshannon merged commit 88dce26 into python:master Dec 30, 2019
8 checks passed
8 checks passed
Windows (x86)
Details
Windows (x64)
Details
macOS
Details
Ubuntu
Details
Azure Pipelines PR #20191229.24 succeeded
Details
bedevere/issue-number Issue number 39114 found
Details
bedevere/news "skip news" label found
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@markshannon markshannon deleted the markshannon:fix-linenumbers-around-finallly-blocks branch Dec 30, 2019
@bedevere-bot

This comment has been minimized.

Sign in to view
Copy link

bedevere-bot commented Dec 30, 2019

@markshannon: Please replace # with GH- in the commit message next time. Thanks!
sthagen added a commit to sthagen/cpython that referenced this pull request Dec 30, 2019
@sthagen
Merge pull request #127 from python/master
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…
5c861bc 
Fix handling of line numbers around finally-blocks. (python#17737)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pablogsal pablogsal

Assignees
No one assigned
Labels
CLA signed skip news
Projects
None yet
Milestone
No milestone
4 participants
@markshannon @pablogsal @bedevere-bot @the-knights-who-say-ni
You can’t perform that action at this time.