Use co_qualname instead of co_name

Author: NN---

Lib/logging/__init__.py

@@ -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, co.co_qualname
+        return co.co_filename, f.f_lineno, co.co_qualname, sinfo
 
     def makeRecord(self, name, level, fn, lno, msg, args, exc_info,
                    func=None, extra=None, sinfo=None):
@@ -1649,19 +1649,16 @@ 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, qualname = self.findCaller(stack_info, stacklevel)
+                fn, lno, func, sinfo = self.findCaller(stack_info, stacklevel)
             except ValueError: # pragma: no cover
-                fn, lno, func, qualname = "(unknown file)", 0, "(unknown function)", "(unknown function)"
+                fn, lno, func = "(unknown file)", 0, "(unknown function)"
         else: # pragma: no cover
-            fn, lno, func, qualname = "(unknown file)", 0, "(unknown function)", "(unknown function)"
+            fn, lno, func = "(unknown file)", 0, "(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)