Python2: Use __name__ rather than __qualname__
The __qualname__ attribute was added in Python 3. Falls back on __name__ for Python 2 compatibility, when __qualname__ is not available. Related-Bug: 1726399 Change-Id: I19d07dc978250e5340327f05ea6ab62ac55489ed
This commit is contained in:
parent
90642dd2ec
commit
67fc801e69
|
@ -47,8 +47,9 @@ class MatchSignaturesMeta(type):
|
||||||
prev_sig = inspect.signature(prev_dfn)
|
prev_sig = inspect.signature(prev_dfn)
|
||||||
val_sig = inspect.signature(value)
|
val_sig = inspect.signature(value)
|
||||||
if prev_sig != val_sig:
|
if prev_sig != val_sig:
|
||||||
|
value_name = getattr(value, '__qualname__', value.__name__)
|
||||||
logging.warning('Signature mismatch in %s. %s != %s',
|
logging.warning('Signature mismatch in %s. %s != %s',
|
||||||
value.__qualname__, prev_sig, val_sig)
|
value_name, prev_sig, val_sig)
|
||||||
|
|
||||||
|
|
||||||
class OrderedMeta(type):
|
class OrderedMeta(type):
|
||||||
|
@ -63,10 +64,11 @@ class OrderedMeta(type):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if name not in allowed_next_methods:
|
if name not in allowed_next_methods:
|
||||||
|
value_name = getattr(value, '__qualname__', value.__name__)
|
||||||
logging.warning(
|
logging.warning(
|
||||||
"Method %s not defined at the correct location. Methods "
|
"Method %s not defined at the correct location. Methods "
|
||||||
"in class %s must be defined in the following order %r",
|
"in class %s must be defined in the following order %r",
|
||||||
value.__qualname__, clsname, ordered_methods
|
value_name, clsname, ordered_methods
|
||||||
)
|
)
|
||||||
continue # pragma: no cover
|
continue # pragma: no cover
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue