Skip to content

Commit

Permalink
gh-102799: replace sys.exc_info by sys.exception in inspect and trace…
Browse files Browse the repository at this point in the history
…back modules (#104032)
  • Loading branch information
iritkatriel authored May 1, 2023
1 parent 2a884ce commit a679c3d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion Lib/inspect.py
Original file line number Diff line number Diff line change
Expand Up @@ -1766,7 +1766,9 @@ def stack(context=1):

def trace(context=1):
"""Return a list of records for the stack below the current exception."""
return getinnerframes(sys.exc_info()[2], context)
exc = sys.exception()
tb = None if exc is None else exc.__traceback__
return getinnerframes(tb, context)


# ------------------------------------------------ static version of getattr
Expand Down
6 changes: 3 additions & 3 deletions Lib/traceback.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,12 @@ def _safe_string(value, what, func=str):
# --

def print_exc(limit=None, file=None, chain=True):
"""Shorthand for 'print_exception(*sys.exc_info(), limit, file, chain)'."""
print_exception(*sys.exc_info(), limit=limit, file=file, chain=chain)
"""Shorthand for 'print_exception(sys.exception(), limit, file, chain)'."""
print_exception(sys.exception(), limit=limit, file=file, chain=chain)

def format_exc(limit=None, chain=True):
"""Like print_exc() but return a string."""
return "".join(format_exception(*sys.exc_info(), limit=limit, chain=chain))
return "".join(format_exception(sys.exception(), limit=limit, chain=chain))

def print_last(limit=None, file=None, chain=True):
"""This is a shorthand for 'print_exception(sys.last_exc, limit, file, chain)'."""
Expand Down

0 comments on commit a679c3d

Please sign in to comment.