Get frame.setlineno working again.

Author: markshannon

Lib/test/test_sys_settrace.py

@@ -1252,7 +1252,7 @@ def test_jump_out_of_block_backwards(output):
             output.append(6)
         output.append(7)
 
-    @async_jump_test(4, 5, [3, 5])
+    @async_jump_test(4, 5, [3], (ValueError, 'into'))
     async def test_jump_out_of_async_for_block_forwards(output):
         for i in [1]:
             async for i in asynciter([1, 2]):
@@ -1294,7 +1294,7 @@ def test_jump_in_nested_finally(output):
                 output.append(8)
             output.append(9)
 
-    @jump_test(6, 7, [2, 7], (ZeroDivisionError, ''))
+    @jump_test(6, 7, [2], (ValueError, 'within'))
     def test_jump_in_nested_finally_2(output):
         try:
             output.append(2)
@@ -1305,7 +1305,7 @@ def test_jump_in_nested_finally_2(output):
             output.append(7)
         output.append(8)
 
-    @jump_test(6, 11, [2, 11], (ZeroDivisionError, ''))
+    @jump_test(6, 11, [2], (ValueError, 'within'))
     def test_jump_in_nested_finally_3(output):
         try:
             output.append(2)
@@ -1320,7 +1320,7 @@ def test_jump_in_nested_finally_3(output):
             output.append(11)
         output.append(12)
 
-    @jump_test(5, 11, [2, 4], (ValueError, 'after'))
+    @jump_test(5, 11, [2, 4], (ValueError, 'exception'))
     def test_no_jump_over_return_try_finally_in_finally_block(output):
         try:
             output.append(2)
@@ -1416,8 +1416,8 @@ def test_jump_backwards_out_of_try_except_block(output):
             output.append(5)
             raise
 
-    @jump_test(5, 7, [4, 7, 8])
-    def test_jump_between_except_blocks(output):
+    @jump_test(5, 7, [4], (ValueError, 'within'))
+    def test_no_jump_between_except_blocks(output):
         try:
             1/0
         except ZeroDivisionError:
@@ -1427,8 +1427,8 @@ def test_jump_between_except_blocks(output):
             output.append(7)
         output.append(8)
 
-    @jump_test(5, 6, [4, 6, 7])
-    def test_jump_within_except_block(output):
+    @jump_test(5, 6, [4], (ValueError, 'within'))
+    def test_no_jump_within_except_block(output):
         try:
             1/0
         except:
@@ -1653,63 +1653,63 @@ def test_no_jump_backwards_into_for_block(output):
             output.append(2)
         output.append(3)
 
-    @async_jump_test(3, 2, [2, 2], (ValueError, 'into'))
+    @async_jump_test(3, 2, [2, 2], (ValueError, 'within'))
     async def test_no_jump_backwards_into_async_for_block(output):
         async for i in asynciter([1, 2]):
             output.append(2)
         output.append(3)
 
-    @jump_test(1, 3, [], (ValueError, 'into'))
+    @jump_test(1, 3, [], (ValueError, 'depth'))
     def test_no_jump_forwards_into_with_block(output):
         output.append(1)
         with tracecontext(output, 2):
             output.append(3)
 
-    @async_jump_test(1, 3, [], (ValueError, 'into'))
+    @async_jump_test(1, 3, [], (ValueError, 'depth'))
     async def test_no_jump_forwards_into_async_with_block(output):
         output.append(1)
         async with asynctracecontext(output, 2):
             output.append(3)
 
-    @jump_test(3, 2, [1, 2, -1], (ValueError, 'into'))
+    @jump_test(3, 2, [1, 2, -1], (ValueError, 'depth'))
     def test_no_jump_backwards_into_with_block(output):
         with tracecontext(output, 1):
             output.append(2)
         output.append(3)
 
-    @async_jump_test(3, 2, [1, 2, -1], (ValueError, 'into'))
+    @async_jump_test(3, 2, [1, 2, -1], (ValueError, 'depth'))
     async def test_no_jump_backwards_into_async_with_block(output):
         async with asynctracecontext(output, 1):
             output.append(2)
         output.append(3)
 
-    @jump_test(1, 3, [], (ValueError, 'into'))
-    def test_no_jump_forwards_into_try_finally_block(output):
+    @jump_test(1, 3, [3, 5])
+    def test_jump_forwards_into_try_finally_block(output):
         output.append(1)
         try:
             output.append(3)
         finally:
             output.append(5)
 
-    @jump_test(5, 2, [2, 4], (ValueError, 'into'))
-    def test_no_jump_backwards_into_try_finally_block(output):
+    @jump_test(5, 2, [2, 4, 2, 4, 5])
+    def test_jump_backwards_into_try_finally_block(output):
         try:
             output.append(2)
         finally:
             output.append(4)
         output.append(5)
 
-    @jump_test(1, 3, [], (ValueError, 'into'))
-    def test_no_jump_forwards_into_try_except_block(output):
+    @jump_test(1, 3, [3])
+    def test_jump_forwards_into_try_except_block(output):
         output.append(1)
         try:
             output.append(3)
         except:
             output.append(5)
             raise
 
-    @jump_test(6, 2, [2], (ValueError, 'into'))
-    def test_no_jump_backwards_into_try_except_block(output):
+    @jump_test(6, 2, [2, 2, 6])
+    def test_jump_backwards_into_try_except_block(output):
         try:
             output.append(2)
         except:
@@ -1718,7 +1718,7 @@ def test_no_jump_backwards_into_try_except_block(output):
         output.append(6)
 
     # 'except' with a variable creates an implicit finally block
-    @jump_test(5, 7, [4], (ValueError, 'into'))
+    @jump_test(5, 7, [4], (ValueError, 'within'))
     def test_no_jump_between_except_blocks_2(output):
         try:
             1/0
@@ -1755,23 +1755,23 @@ def test_jump_out_of_finally_block(output):
         finally:
             output.append(5)
 
-    @jump_test(1, 5, [], (ValueError, "into an 'except'"))
+    @jump_test(1, 5, [], (ValueError, "into an exception"))
     def test_no_jump_into_bare_except_block(output):
         output.append(1)
         try:
             output.append(3)
         except:
             output.append(5)
 
-    @jump_test(1, 5, [], (ValueError, "into an 'except'"))
+    @jump_test(1, 5, [], (ValueError, "into an exception"))
     def test_no_jump_into_qualified_except_block(output):
         output.append(1)
         try:
             output.append(3)
         except Exception:
             output.append(5)
 
-    @jump_test(3, 6, [2, 5, 6], (ValueError, "into an 'except'"))
+    @jump_test(3, 6, [2, 5, 6], (ValueError, "into an exception"))
     def test_no_jump_into_bare_except_block_from_try_block(output):
         try:
             output.append(2)
@@ -1782,7 +1782,7 @@ def test_no_jump_into_bare_except_block_from_try_block(output):
             raise
         output.append(8)
 
-    @jump_test(3, 6, [2], (ValueError, "into an 'except'"))
+    @jump_test(3, 6, [2], (ValueError, "into an exception"))
     def test_no_jump_into_qualified_except_block_from_try_block(output):
         try:
             output.append(2)
@@ -1793,7 +1793,7 @@ def test_no_jump_into_qualified_except_block_from_try_block(output):
             raise
         output.append(8)
 
-    @jump_test(7, 1, [1, 3, 6], (ValueError, "out of an 'except'"))
+    @jump_test(7, 1, [1, 3, 6], (ValueError, "within"))
     def test_no_jump_out_of_bare_except_block(output):
         output.append(1)
         try:
@@ -1803,7 +1803,7 @@ def test_no_jump_out_of_bare_except_block(output):
             output.append(6)
             output.append(7)
 
-    @jump_test(7, 1, [1, 3, 6], (ValueError, "out of an 'except'"))
+    @jump_test(7, 1, [1, 3, 6], (ValueError, "within"))
     def test_no_jump_out_of_qualified_except_block(output):
         output.append(1)
         try: