Python 3.10 now traces back to with statements when exiting the with block. When the exit is a break statement, the with exit is visited before the break statement is. This seems confusing.

--- 8< -----------------------------------------

import linecache, sys

def trace(frame, event, arg):
    # The weird globals here is to avoid a NameError on shutdown...
    if frame.f_code.co_filename == globals().get("__file__"):
        lineno = frame.f_lineno
        print("{} {}: {}".format(event[:4], lineno, linecache.getline(__file__, lineno).rstrip()))
    return trace

def doit():
    for i in range(2):
        with open("test", "w") as f:
            a = 13
            b = 14
            break
    c = 16

print(sys.version)
sys.settrace(trace)
doit()

--- 8< -----------------------------------------

3.10.0b2 (default, Jun 3 2021, 05:27:13) [Clang 12.0.0 (clang-1200.0.32.29)]
call 10: def doit():
line 11: for i in range(2):
line 12: with open("test", "w") as f:
line 13: a = 13
line 14: b = 14
line 12: with open("test", "w") as f:
line 15: break
line 16: c = 16
retu 16: c = 16

Shouldn't we get a trace for line 15 (break), then line 12 (with-exit), then line 15 again, then line 16?

(I'm not sure whether to create other issues for further details)

I'm also seeing a return in a with will trace withexit/return for a plain "return" statement, but return/withexit/return for a return with a value ("return 17").

I would expect that a statement causing an exit from a with block would always be traced before the with-exit.

For context, this behavior was introduced in https://bugs.python.org/issue43933

Why this occurs:

with cm: 
    A
    break

translates to something like:

ex = cm.__exit__; cm.__enter__()  # with cm
    A
    ex(...)
    goto loop_end   # break

So, the break is traced after the exit call.

However, this doesn't seem consistent with try-finally statements which trace any break/continue/return before the finally block.

New changeset 937cebc by Mark Shannon in branch 'main':
bpo-44298: Fix line numbers for early exits in with statements. (GH-26513)
937cebc

New changeset cea0585 by Mark Shannon in branch '3.10':
[3.10] bpo-44298: Backport bpo-26513 to 3.10 (bpo-26516)
cea0585

Ned, can you confirm that this works for you? I am closing the issue, but if something is missing, please, reopen it and we will look into it :)

Thanks for the quick turnaround, this works!

this appears to have caused a regression in line numbers for return statements. #93975