bpo-42246: Make sure that line number is correct after a return, as required by PEP 626 (GH-23495)
Make sure that line number is correct after a return, as defined by PEP 626.
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index 190e1a6..1e61f41 100644
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -156,7 +156,7 @@ def test_leading_newlines(self):
s256 = "".join(["\n"] * 256 + ["spam"])
co = compile(s256, 'fn', 'exec')
self.assertEqual(co.co_firstlineno, 1)
- self.assertEqual(list(co.co_lines()), [(0, 4, 257), (4, 8, None)])
+ self.assertEqual(list(co.co_lines()), [(0, 8, 257)])
def test_literals_with_leading_zeroes(self):
for arg in ["077787", "0xj", "0x.", "0e", "090000000000000",
@@ -775,6 +775,39 @@ def or_false(x):
self.assertIn('LOAD_', opcodes[0].opname)
self.assertEqual('RETURN_VALUE', opcodes[1].opname)
+ def test_lineno_after_implicit_return(self):
+ TRUE = True
+ # Don't use constant True or False, as compiler will remove test
+ def if1(x):
+ x()
+ if TRUE:
+ pass
+ def if2(x):
+ x()
+ if TRUE:
+ pass
+ else:
+ pass
+ def if3(x):
+ x()
+ if TRUE:
+ pass
+ else:
+ return None
+ def if4(x):
+ x()
+ if not TRUE:
+ pass
+ funcs = [ if1, if2, if3, if4]
+ lastlines = [ 3, 3, 3, 2]
+ frame = None
+ def save_caller_frame():
+ nonlocal frame
+ frame = sys._getframe(1)
+ for func, lastline in zip(funcs, lastlines, strict=True):
+ with self.subTest(func=func):
+ func(save_caller_frame)
+ self.assertEqual(frame.f_lineno-frame.f_code.co_firstlineno, lastline)
def test_big_dict_literal(self):
# The compiler has a flushing point in "compiler_dict" that calls compiles
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index 9cd11d3..d0743d6 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -131,12 +131,14 @@ def bug708901():
12 STORE_FAST 0 (res)
%3d 14 JUMP_ABSOLUTE 10
- >> 16 LOAD_CONST 0 (None)
+
+%3d >> 16 LOAD_CONST 0 (None)
18 RETURN_VALUE
""" % (bug708901.__code__.co_firstlineno + 1,
bug708901.__code__.co_firstlineno + 2,
bug708901.__code__.co_firstlineno + 1,
- bug708901.__code__.co_firstlineno + 3)
+ bug708901.__code__.co_firstlineno + 3,
+ bug708901.__code__.co_firstlineno + 1)
def bug1333982(x=[]):
@@ -295,13 +297,15 @@ def bug1333982(x=[]):
52 STORE_FAST 0 (e)
54 DELETE_FAST 0 (e)
56 RERAISE
- >> 58 RERAISE
+
+%3d >> 58 RERAISE
""" % (TRACEBACK_CODE.co_firstlineno + 1,
TRACEBACK_CODE.co_firstlineno + 2,
TRACEBACK_CODE.co_firstlineno + 5,
TRACEBACK_CODE.co_firstlineno + 3,
TRACEBACK_CODE.co_firstlineno + 4,
- TRACEBACK_CODE.co_firstlineno + 5)
+ TRACEBACK_CODE.co_firstlineno + 5,
+ TRACEBACK_CODE.co_firstlineno + 3)
def _fstring(a, b, c, d):
return f'{a} {b:4} {c!r} {d!r:4}'