Skip to content

gh-105658: fix excess trace events for except block ending with a conditional block #109384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iritkatriel merged 4 commits into from
Sep 14, 2023
Merged

gh-105658: fix excess trace events for except block ending with a conditional block #109384

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c96ba2e
gh-109156: fix excess trace events for except block ending with a con…
iritkatriel Sep 13, 2023
ce7aa48
Merge remote-tracking branch 'upstream/main' into lineno-try
iritkatriel Sep 13, 2023
f5d2eee
typo
iritkatriel Sep 14, 2023
ee10731
add test
iritkatriel Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
add test
  • Loading branch information
@iritkatriel
iritkatriel committed Sep 14, 2023
commit ee10731d75a588ed949ba90f87f2a7781ddce928
29 changes: 29 additions & 0 deletions Lib/test/test_sys_settrace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,6 +929,35 @@ def func():
(6, 'line'),
(6, 'return')])

def test_finally_with_conditional(self):

# See gh-105658
condition = True
def func():
try:
try:
raise Exception
finally:
if condition:
result = 1
result = 2
except:
result = 3
return result

self.run_and_compare(func,
[(0, 'call'),
(1, 'line'),
(2, 'line'),
(3, 'line'),
(3, 'exception'),
(5, 'line'),
(6, 'line'),

@iritkatriel iritkatriel Sep 14, 2023

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On main we have here another
(5, 'line'),

(8, 'line'),
(9, 'line'),
(10, 'line'),
(10, 'return')])

def test_break_to_continue1(self):

def func():
Expand Down