Skip to content

gh-128688 Introduce qualname in extra parameters providing qualified name including classname. #128634

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

Closed
wants to merge 6 commits into from
Closed

gh-128688 Introduce qualname in extra parameters providing qualified name including classname. #128634

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c790454
Introduce qualname in extra parameters providing qualified name inclu…
NN--- Jan 8, 2025
5949361
Fix formatting
NN--- Jan 8, 2025
ff067e7
Use co_qualname instead of co_name
NN--- Jan 9, 2025
e96fa72
Add use_qualname
NN--- Jan 9, 2025
03ee242
Fix casing
NN--- Jan 9, 2025
ea98fc7
Merge branch 'main' into feature/logging_qualname
NN--- Jan 9, 2025
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
11 changes: 7 additions & 4 deletions Lib/logging/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1620,7 +1620,7 @@ def findCaller(self, stack_info=False, stacklevel=1):
sinfo = sio.getvalue()
if sinfo[-1] == '\n':
sinfo = sinfo[:-1]
return co.co_filename, f.f_lineno, co.co_name, sinfo
return co.co_filename, f.f_lineno, co.co_name, sinfo, co.co_qualname

def makeRecord(self, name, level, fn, lno, msg, args, exc_info,
func=None, extra=None, sinfo=None):
Expand Down Expand Up @@ -1649,16 +1649,19 @@ def _log(self, level, msg, args, exc_info=None, extra=None, stack_info=False,
#exception on some versions of IronPython. We trap it here so that
#IronPython can use logging.
try:
fn, lno, func, sinfo = self.findCaller(stack_info, stacklevel)
fn, lno, func, sinfo, qualname = self.findCaller(stack_info, stacklevel)
except ValueError: # pragma: no cover
fn, lno, func = "(unknown file)", 0, "(unknown function)"
fn, lno, func, qualname = "(unknown file)", 0, "(unknown function)", "(unknown function)"
else: # pragma: no cover
fn, lno, func = "(unknown file)", 0, "(unknown function)"
fn, lno, func, qualname = "(unknown file)", 0, "(unknown function)", "(unknown function)"
if exc_info:
if isinstance(exc_info, BaseException):
exc_info = (type(exc_info), exc_info, exc_info.__traceback__)
elif not isinstance(exc_info, tuple):
exc_info = sys.exc_info()
if extra is None:
extra = {}
extra['__qualname__'] = qualname
record = self.makeRecord(self.name, level, fn, lno, msg, args,
exc_info, func, extra, sinfo)
self.handle(record)
Expand Down
Loading