Skip to content

Commit

Permalink
gh-102799: replace internal sys.exc_info() call by sys.exception() (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
iritkatriel committed Jul 14, 2023
1 parent 89ec0e9 commit fb32f35
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Lib/logging/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ def formatException(self, ei):
# See issues #9427, #1553375. Commented out for now.
#if getattr(self, 'fullstack', False):
# traceback.print_stack(tb.tb_frame.f_back, file=sio)
traceback.print_exception(ei[0], ei[1], tb, None, sio)
traceback.print_exception(ei[0], ei[1], tb, limit=None, file=sio)
s = sio.getvalue()
sio.close()
if s[-1:] == "\n":
Expand Down Expand Up @@ -1080,14 +1080,14 @@ def handleError(self, record):
The record which was being processed is passed in to this method.
"""
if raiseExceptions and sys.stderr: # see issue 13807
t, v, tb = sys.exc_info()
exc = sys.exception()
try:
sys.stderr.write('--- Logging error ---\n')
traceback.print_exception(t, v, tb, None, sys.stderr)
traceback.print_exception(exc, limit=None, file=sys.stderr)
sys.stderr.write('Call stack:\n')
# Walk the stack frame up until we're out of logging,
# so as to print the calling context.
frame = tb.tb_frame
frame = exc.__traceback__.tb_frame
while (frame and os.path.dirname(frame.f_code.co_filename) ==
__path__[0]):
frame = frame.f_back
Expand All @@ -1112,7 +1112,7 @@ def handleError(self, record):
except OSError: #pragma: no cover
pass # see issue 5971
finally:
del t, v, tb
del exc

def __repr__(self):
level = getLevelName(self.level)
Expand Down

0 comments on commit fb32f35

Please sign in to comment.