Thanks to visit codestin.com
Credit goes to github.com

Skip to content

bpo-45292: [PEP 654] Update traceback display code to work with exception groups #29207

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 27 commits into from
Nov 5, 2021
Merged

bpo-45292: [PEP 654] Update traceback display code to work with exception groups #29207

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
42bed01
C traceback code
iritkatriel Oct 5, 2021
a2daa23
add ExceptionGroups support to traceback.py
iritkatriel Oct 8, 2021
261917a
remove 'with X sub-exceptions' line from tracebacks
iritkatriel Oct 24, 2021
7613b43
pass margin instead of margin_char
iritkatriel Oct 25, 2021
d98a72b
update news
iritkatriel Oct 25, 2021
d69916e
excs is tuple, use PyTuple apis. Change check to assertion.
iritkatriel Oct 25, 2021
f5cab69
remove redundant num_excs > 0 check (it is asserted above)
iritkatriel Oct 25, 2021
5170f00
remove cpython_only from exception group tests
iritkatriel Oct 25, 2021
2052c77
handle recursion errors (vert deeply nested EGs)
iritkatriel Oct 25, 2021
5097300
WRITE_INDENTED_MARGIN macro --> write_indented_margin function
iritkatriel Oct 26, 2021
dc21cf8
move new traceback utils to internal/
iritkatriel Oct 26, 2021
d4007b7
test improvements
iritkatriel Oct 26, 2021
169934e
pep7, improve error checking and clarity
iritkatriel Oct 26, 2021
aa4da45
add missing test to cover print_chained with/without parent_label
iritkatriel Oct 26, 2021
6ee84f7
compare the complete expected tb text
iritkatriel Oct 26, 2021
ac7f34c
Update Misc/NEWS.d/next/Core and Builtins/2021-09-26-18-18-50.bpo-452…
iritkatriel Oct 26, 2021
d0d4961
don't need the regex anymore
iritkatriel Oct 26, 2021
5c1015d
remove full-path labels
iritkatriel Oct 29, 2021
83abebd
int --> bool
iritkatriel Oct 29, 2021
16d077d
move code around
iritkatriel Oct 29, 2021
64fb164
Tweak the top-level of traceback box as suggested by Yury
iritkatriel Oct 31, 2021
88019f5
tidy up error handling
iritkatriel Nov 1, 2021
e963835
add limits for width and depth of formatted exception groups
iritkatriel Nov 2, 2021
e85510a
use _PyBaseExceptionGroup_Check macro
iritkatriel Nov 2, 2021
c15a7bd
remove redundant PyErr_Clear
iritkatriel Nov 2, 2021
d8cc6e8
minor tweak - move if out of loop
iritkatriel Nov 2, 2021
61fab3f
remove excess whitespace
iritkatriel Nov 3, 2021
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
Next Next commit
move code around
  • Loading branch information
@iritkatriel
iritkatriel committed Oct 29, 2021
commit 16d077d458099e7d3d2b5455747f34e879488c61
31 changes: 15 additions & 16 deletions Lib/traceback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,19 +609,13 @@ def __init__(self):
self.need_close = False

def indent(self):
return 2 * self.exception_group_depth

def margin(self):
return '| ' if self.exception_group_depth else ''

def get_indent(self):
return ' ' * self.indent()

def get_indented_margin(self):
return self.get_indent() + self.margin()
return ' ' * (2 * self.exception_group_depth)

def emit(self, text_gen):
indent_str = self.get_indented_margin()
margin_char = '|'
margin = f'{margin_char} ' if self.exception_group_depth else ''
indent_str = self.indent() + margin

if isinstance(text_gen, str):
yield textwrap.indent(text_gen, indent_str, lambda line: True)
else:
Expand Down Expand Up @@ -888,11 +882,14 @@ def format(self, *, chain=True, _ctx=None):
yield from _ctx.emit(exc.stack.format())
yield from _ctx.emit(exc.format_exception_only())
else:
if _ctx.exception_group_depth == 0:
is_toplevel = (_ctx.exception_group_depth == 0)
if is_toplevel:
_ctx.exception_group_depth += 1
Copy link
Copy Markdown
Member

@merwok merwok Jan 3, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

FYI running patchcheck for an unrelated PR just complained about this 5-space indent!
(and more in Lib/traceback.py)


if exc.stack:
yield from _ctx.emit('Traceback (most recent call last):\n')
yield from _ctx.emit(exc.stack.format())

yield from _ctx.emit(exc.format_exception_only())
n = len(exc.exceptions)
_ctx.need_close = False
Expand All @@ -901,7 +898,7 @@ def format(self, *, chain=True, _ctx=None):
if last_exc:
# The closing frame may be added by a recursive call
_ctx.need_close = True
yield (_ctx.get_indent() +
yield (_ctx.indent() +
('+-' if i==0 else ' ') +
f'+---------------- {i + 1} ----------------\n')
_ctx.exception_group_depth += 1
Expand All @@ -910,12 +907,14 @@ def format(self, *, chain=True, _ctx=None):
except RecursionError:
pass
if last_exc and _ctx.need_close:
yield (_ctx.get_indent() +
yield (_ctx.indent() +
"+------------------------------------\n")
_ctx.need_close = False
_ctx.exception_group_depth -= 1;
Comment thread
iritkatriel marked this conversation as resolved.
Outdated
if _ctx.exception_group_depth == 1:
_ctx.exception_group_depth -= 1

if is_toplevel:
assert _ctx.exception_group_depth == 1
_ctx.exception_group_depth = 0


def print(self, *, file=None, chain=True):
Expand Down