summaryrefslogtreecommitdiffstats
path: root/Lib/logging
diff options
context:
space:
mode:
authorIrit Katriel <1055913+iritkatriel@users.noreply.github.com>2023-07-14 19:41:24 (GMT)
committerGitHub <noreply@github.com>2023-07-14 19:41:24 (GMT)
commitfb32f35c0585b1dbb87b6f254818e1f485a50f65 (patch)
treea54d6e2c20fe4cdf4957321d8f202ac820371090 /Lib/logging
parent89ec0e952965b6a1be40e26c3ddc4131599e5ee9 (diff)
downloadcpython-fb32f35c0585b1dbb87b6f254818e1f485a50f65.zip
cpython-fb32f35c0585b1dbb87b6f254818e1f485a50f65.tar.gz
cpython-fb32f35c0585b1dbb87b6f254818e1f485a50f65.tar.bz2
gh-102799: replace internal sys.exc_info() call by sys.exception() (#106746)
Diffstat (limited to 'Lib/logging')
-rw-r--r--Lib/logging/__init__.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 2a011b6..46e86cb 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -662,7 +662,7 @@ class Formatter(object):
# 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":
@@ -1080,14 +1080,14 @@ class Handler(Filterer):
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
@@ -1112,7 +1112,7 @@ class Handler(Filterer):
except OSError: #pragma: no cover
pass # see issue 5971
finally:
- del t, v, tb
+ del exc
def __repr__(self):
level = getLevelName(self.level)