◐ Shell
reader mode source ↗
Skip to content

bpo-33026: Fix jumping out of "with" block by setting f_lineno.#6026

Merged
serhiy-storchaka merged 2 commits into
python:masterfrom
serhiy-storchaka:jump-out-of-with
Mar 11, 2018
Merged

bpo-33026: Fix jumping out of "with" block by setting f_lineno.#6026
serhiy-storchaka merged 2 commits into
python:masterfrom
serhiy-storchaka:jump-out-of-with

Conversation

@serhiy-storchaka

@serhiy-storchaka serhiy-storchaka commented Mar 8, 2018 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

@serhiy-storchaka serhiy-storchaka added the type-bug An unexpected behavior, bug, or error label Mar 8, 2018
@serhiy-storchaka serhiy-storchaka requested a review from pitrou March 8, 2018 07:57
@serhiy-storchaka serhiy-storchaka merged commit 26c9f56 into python:master Mar 11, 2018
@bedevere-bot

bedevere-bot commented Mar 11, 2018

Copy link
Copy Markdown

@serhiy-storchaka: Please replace # with GH- in the commit message next time. Thanks!

@miss-islington

miss-islington commented Mar 11, 2018

Copy link
Copy Markdown
Contributor

Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7.
🐍🍒⛏🤖

@serhiy-storchaka serhiy-storchaka deleted the jump-out-of-with branch March 11, 2018 06:32
@miss-islington

miss-islington commented Mar 11, 2018

Copy link
Copy Markdown
Contributor

Sorry, @serhiy-storchaka, I could not cleanly backport this to 3.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 26c9f565d016db21257a60d29ab2c99383dd5ac7 3.7

serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request Mar 11, 2018
@serhiy-storchaka
[3.7] bpo-33026: Fix jumping out of "with" block by setting f_lineno. (… …
40fc10e 
…pythonGH-6026).

(cherry picked from commit 26c9f56)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
@bedevere-bot

bedevere-bot commented Mar 11, 2018

Copy link
Copy Markdown

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 11, 2018
@serhiy-storchaka @miss-islington
[3.7] bpo-33026: Fix jumping out of "with" block by setting f_lineno. (… …
db8a32d 
…pythonGH-6026). (pythonGH-6074)

(cherry picked from commit 26c9f56)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
(cherry picked from commit 04aadf2)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 11, 2018
@serhiy-storchaka @miss-islington
[3.7] bpo-33026: Fix jumping out of "with" block by setting f_lineno. (… …
822ebb8 
…pythonGH-6026). (pythonGH-6074)

(cherry picked from commit 26c9f56)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
(cherry picked from commit 04aadf2)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
serhiy-storchaka added a commit that referenced this pull request Mar 11, 2018
@miss-islington @serhiy-storchaka
[3.6] bpo-33026: Fix jumping out of "with" block by setting f_lineno. (… …
20ac11a 
…GH-6026). (GH-6074) (GH-6075)

(cherry picked from commit 26c9f56)
(cherry picked from commit 04aadf2)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
serhiy-storchaka added a commit that referenced this pull request Mar 11, 2018
@miss-islington @serhiy-storchaka
[2.7] bpo-33026: Fix jumping out of "with" block by setting f_lineno. (… …
3854f58 
…GH-6026). (GH-6074) (GH-6076)

(cherry picked from commit 26c9f56)
(cherry picked from commit 04aadf2)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
jo2y pushed a commit to jo2y/cpython that referenced this pull request Mar 23, 2018
@serhiy-storchaka @jo2y
bpo-33026: Fix jumping out of "with" block by setting f_lineno. (pyth… …
737f227 
…on#6026)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pitrou pitrou Awaiting requested review from pitrou

Assignees

No one assigned

Labels

type-bug An unexpected behavior, bug, or error

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@serhiy-storchaka @bedevere-bot @miss-islington @the-knights-who-say-ni