changeset: 76394:0695f5d028a7 parent: 76392:4111a2b5ff57 parent: 76393:6a0a073e8461 user: Benjamin Peterson date: Wed Apr 18 11:19:00 2012 -0400 files: Lib/test/test_sys_settrace.py Misc/NEWS Objects/frameobject.c description: merge 3.2 (#14612) diff -r 4111a2b5ff57 -r 0695f5d028a7 Lib/test/test_sys_settrace.py --- a/Lib/test/test_sys_settrace.py Wed Apr 18 16:59:52 2012 +0200 +++ b/Lib/test/test_sys_settrace.py Wed Apr 18 11:19:00 2012 -0400 @@ -675,6 +675,14 @@ no_jump_to_non_integers.jump = (2, "Spam") 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 # trickery. def no_jump_without_trace_function(): @@ -750,6 +758,9 @@ # Must set sys.settrace(None) in setUp(), else condition is not # triggered. 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): d = {} diff -r 4111a2b5ff57 -r 0695f5d028a7 Misc/NEWS --- a/Misc/NEWS Wed Apr 18 16:59:52 2012 +0200 +++ b/Misc/NEWS Wed Apr 18 11:19:00 2012 -0400 @@ -14,6 +14,8 @@ object for importlib.util.module_for_loader and 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 globals raises a KeyError. diff -r 4111a2b5ff57 -r 0695f5d028a7 Objects/frameobject.c --- a/Objects/frameobject.c Wed Apr 18 16:59:52 2012 +0200 +++ b/Objects/frameobject.c Wed Apr 18 11:19:00 2012 -0400 @@ -199,6 +199,7 @@ case SETUP_LOOP: case SETUP_EXCEPT: case SETUP_FINALLY: + case SETUP_WITH: blockstack[blockstack_top++] = addr; in_finally[blockstack_top-1] = 0; break; @@ -206,7 +207,7 @@ case POP_BLOCK: assert(blockstack_top > 0); 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; } else { @@ -221,7 +222,7 @@ * be seeing such an END_FINALLY.) */ if (blockstack_top > 0) { setup_op = code[blockstack[blockstack_top-1]]; - if (setup_op == SETUP_FINALLY) { + if (setup_op == SETUP_FINALLY || setup_op == SETUP_WITH) { blockstack_top--; } } @@ -283,6 +284,7 @@ case SETUP_LOOP: case SETUP_EXCEPT: case SETUP_FINALLY: + case SETUP_WITH: delta_iblock++; break;