ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-14 16:27:13 +03:00
Code Issues Projects Releases Wiki Activity

Added name mangling support to EDMCContextFilter

Browse Source 
Python name mangling is more about name collisions than actually making
things private.

This commit adds a check to resolve mangled names to their runtime
names, and adds a just-in-case default to fetching the attribute.

Fixes #764
This commit is contained in:
A_D 2020-10-18 09:48:23 +02:00 committed by Athanasius
parent 7be255b8ac
commit d650db5a1a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
EDMCLogging.py
View File

@ -287,11 +287,15 @@ class EDMCContextFilter(logging.Filter):
frame_info = inspect.getframeinfo(frame) frame_info = inspect.getframeinfo(frame)
args, _, _, value_dict = inspect.getargvalues(frame) args, _, _, value_dict = inspect.getargvalues(frame)
if len(args) and args[0] in ('self', 'cls'): if len(args) and args[0] in ('self', 'cls'):
frame_class = value_dict[args[0]] frame_class: 'object' = value_dict[args[0]]
if frame_class: if frame_class:
# See https://en.wikipedia.org/wiki/Name_mangling#Python for how name mangling works.
if (name := frame_info.function).startswith("__") and not name.endswith("__"):
name = f'_{frame_class.__class__.__name__}{frame_info.function}'
# Find __qualname__ of the caller # Find __qualname__ of the caller
fn = getattr(frame_class, frame_info.function) fn = getattr(frame_class, name, None)
if fn and fn.__qualname__: if fn and fn.__qualname__:
caller_qualname = fn.__qualname__ caller_qualname = fn.__qualname__

4
EDMarketConnector.py
View File

@ -1165,6 +1165,10 @@ sys.path: {sys.path}'''
def __init__(self): def __init__(self):
logger.debug('A call from A.B.__init__') logger.debug('A call from A.B.__init__')
self.__test()
def __test(self):
logger.debug("A call from A.B.__test")
# abinit = A.B() # abinit = A.B()