mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

merge 3.2 (#14612)

Browse source
This commit is contained in:
Benjamin Peterson 2012-04-18 11:19:00 -04:00
commit 6e3358a1d5
3 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/test/test_sys_settrace.py
View file

@ -675,6 +675,14 @@ def no_jump_to_non_integers(output):
no_jump_to_non_integers.jump = (2, "Spam") no_jump_to_non_integers.jump = (2, "Spam")
no_jump_to_non_integers.output = [True] no_jump_to_non_integers.output = [True]
def jump_across_with(output):
with open(support.TESTFN, "wb") as fp:
pass
with open(support.TESTFN, "wb") as fp:
pass
jump_across_with.jump = (1, 3)
jump_across_with.output = []
# This verifies that you can't set f_lineno via _getframe or similar # This verifies that you can't set f_lineno via _getframe or similar
# trickery. # trickery.
def no_jump_without_trace_function(): def no_jump_without_trace_function():
@ -750,6 +758,9 @@ class JumpTestCase(unittest.TestCase):
# Must set sys.settrace(None) in setUp(), else condition is not # Must set sys.settrace(None) in setUp(), else condition is not
# triggered. # triggered.
no_jump_without_trace_function() no_jump_without_trace_function()
def test_jump_across_with(self):
self.addCleanup(support.unlink, support.TESTFN)
self.run_test(jump_across_with)
def test_20_large_function(self): def test_20_large_function(self):
d = {} d = {}

2
Misc/NEWS
View file

@ -14,6 +14,8 @@ Core and Builtins
object for importlib.util.module_for_loader and object for importlib.util.module_for_loader and
importlib.machinery.PathFinder. importlib.machinery.PathFinder.
- Issue #14612: Fix jumping around with blocks by setting f_lineno.
- Issue #14592: Attempting a relative import w/o __package__ or __name__ set in - Issue #14592: Attempting a relative import w/o __package__ or __name__ set in
globals raises a KeyError. globals raises a KeyError.

6
Objects/frameobject.c
View file

@ -199,6 +199,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno)
case SETUP_LOOP: case SETUP_LOOP:
case SETUP_EXCEPT: case SETUP_EXCEPT:
case SETUP_FINALLY: case SETUP_FINALLY:
case SETUP_WITH:
blockstack[blockstack_top++] = addr; blockstack[blockstack_top++] = addr;
in_finally[blockstack_top-1] = 0; in_finally[blockstack_top-1] = 0;
break; break;
@ -206,7 +207,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno)
case POP_BLOCK: case POP_BLOCK:
assert(blockstack_top > 0); assert(blockstack_top > 0);
setup_op = code[blockstack[blockstack_top-1]]; setup_op = code[blockstack[blockstack_top-1]];
if (setup_op == SETUP_FINALLY) { if (setup_op == SETUP_FINALLY || setup_op == SETUP_WITH) {
in_finally[blockstack_top-1] = 1; in_finally[blockstack_top-1] = 1;
} }
else { else {
@ -221,7 +222,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno)
* be seeing such an END_FINALLY.) */ * be seeing such an END_FINALLY.) */
if (blockstack_top > 0) { if (blockstack_top > 0) {
setup_op = code[blockstack[blockstack_top-1]]; setup_op = code[blockstack[blockstack_top-1]];
if (setup_op == SETUP_FINALLY) { if (setup_op == SETUP_FINALLY || setup_op == SETUP_WITH) {
blockstack_top--; blockstack_top--;
} }
} }
@ -283,6 +284,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno)
case SETUP_LOOP: case SETUP_LOOP:
case SETUP_EXCEPT: case SETUP_EXCEPT:
case SETUP_FINALLY: case SETUP_FINALLY:
case SETUP_WITH:
delta_iblock++; delta_iblock++;
break; break;