summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2021-10-11 06:17:02 -0400
committerNed Batchelder <ned@nedbatchelder.com>2021-10-11 06:17:02 -0400
commitbcff84fb55d03643bf0a182d79a5ac8e809ec457 (patch)
treeb49f0f1f912b32af0088c4fffd34c1c9702953ae
parent9b54389d91c68b27913ded2898f3a03df7e8e90d (diff)
downloadpython-coveragepy-git-bcff84fb55d03643bf0a182d79a5ac8e809ec457.tar.gz
refactor: remove qualname code that was only for Python 2
-rw-r--r--coverage/context.py36
1 files changed, 5 insertions, 31 deletions
diff --git a/coverage/context.py b/coverage/context.py
index 43d2b1cc..6bb1f1ee 100644
--- a/coverage/context.py
+++ b/coverage/context.py
@@ -55,37 +55,11 @@ def qualname_from_frame(frame):
func = frame.f_globals.get(fname)
if func is None:
return None
- return func.__module__ + '.' + fname
+ return func.__module__ + "." + fname
- func = getattr(method, '__func__', None)
+ func = getattr(method, "__func__", None)
if func is None:
cls = self.__class__
- return cls.__module__ + '.' + cls.__name__ + "." + fname
-
- if hasattr(func, '__qualname__'):
- qname = func.__module__ + '.' + func.__qualname__
- else:
- for cls in getattr(self.__class__, '__mro__', ()):
- f = cls.__dict__.get(fname, None)
- if f is None:
- continue
- if f is func:
- qname = cls.__module__ + '.' + cls.__name__ + "." + fname
- break
- else:
- # Support for old-style classes.
- def mro(bases):
- for base in bases:
- f = base.__dict__.get(fname, None)
- if f is func:
- return base.__module__ + '.' + base.__name__ + "." + fname
- for base in bases:
- qname = mro(base.__bases__) # pylint: disable=cell-var-from-loop
- if qname is not None:
- return qname
- return None
- qname = mro([self.__class__])
- if qname is None:
- qname = func.__module__ + '.' + fname
-
- return qname
+ return cls.__module__ + "." + cls.__name__ + "." + fname
+
+ return func.__module__ + "." + func.__qualname__