bpo-42246: Partial implementation of PEP 626. (GH-23113)
* Implement new line number table format, as defined in PEP 626.
diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
index ac3dde7..467e8e5 100644
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -258,7 +258,7 @@ def func2():
("co_cellvars", ("cellvar",)),
("co_filename", "newfilename"),
("co_name", "newname"),
- ("co_lnotab", code2.co_lnotab),
+ ("co_linetable", code2.co_linetable),
):
with self.subTest(attr=attr, value=value):
new_code = code.replace(**{attr: value})
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index 6055192..0e06d11 100644
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -155,8 +155,8 @@ def test_indentation(self):
def test_leading_newlines(self):
s256 = "".join(["\n"] * 256 + ["spam"])
co = compile(s256, 'fn', 'exec')
- self.assertEqual(co.co_firstlineno, 257)
- self.assertEqual(co.co_lnotab, bytes())
+ self.assertEqual(co.co_firstlineno, 1)
+ self.assertEqual(list(co.co_lines()), [(0, 4, 257), (4, 8, None)])
def test_literals_with_leading_zeroes(self):
for arg in ["077787", "0xj", "0x.", "0e", "090000000000000",
diff --git a/Lib/test/test_opcodes.py b/Lib/test/test_opcodes.py
index 1152eb6..e510364 100644
--- a/Lib/test/test_opcodes.py
+++ b/Lib/test/test_opcodes.py
@@ -27,7 +27,7 @@ def test_setup_annotations_line(self):
with open(ann_module.__file__) as f:
txt = f.read()
co = compile(txt, ann_module.__file__, 'exec')
- self.assertEqual(co.co_firstlineno, 3)
+ self.assertEqual(co.co_firstlineno, 1)
except OSError:
pass
diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py
index e564513..4bb574f 100644
--- a/Lib/test/test_pdb.py
+++ b/Lib/test/test_pdb.py
@@ -1645,9 +1645,10 @@ def test_errors_in_command(self):
'debug doesnotexist',
'c',
])
- stdout, _ = self.run_pdb_script('', commands + '\n')
+ stdout, _ = self.run_pdb_script('pass', commands + '\n')
self.assertEqual(stdout.splitlines()[1:], [
+ '-> pass',
'(Pdb) *** SyntaxError: unexpected EOF while parsing',
'(Pdb) ENTERING RECURSIVE DEBUGGER',
diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index dd4418d..66b1b36 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -220,8 +220,7 @@ def ireturn_example():
(2, 'line'),
(3, 'line'),
(4, 'line'),
- (6, 'line'),
- (6, 'return')]
+ (4, 'return')]
# Tight loop with while(1) example (SF #765624)
def tightloop_example():
@@ -602,6 +601,17 @@ def run(tracer):
self.compare_events(doit_async.__code__.co_firstlineno,
tracer.events, events)
+ def test_21_repeated_pass(self):
+ def func():
+ pass
+ pass
+
+ self.run_and_compare(func,
+ [(0, 'call'),
+ (1, 'line'),
+ (2, 'line'),
+ (2, 'return')])
+
def test_loop_in_try_except(self):
# https://bugs.python.org/issue41670
@@ -766,7 +776,7 @@ def trace(self, frame, event, arg):
if (self.firstLine is None and frame.f_code == self.code and
event == 'line'):
self.firstLine = frame.f_lineno - 1
- if (event == self.event and self.firstLine and
+ if (event == self.event and self.firstLine is not None and
frame.f_lineno == self.firstLine + self.jumpFrom):
f = frame
while f is not None and f.f_code != self.code:
@@ -1540,7 +1550,7 @@ def test_jump_to_firstlineno(self):
""", "<fake module>", "exec")
class fake_function:
__code__ = code
- tracer = JumpTracer(fake_function, 2, 0)
+ tracer = JumpTracer(fake_function, 4, 1)
sys.settrace(tracer.trace)
namespace = {"output": []}
exec(code, namespace)