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

Add paranoia checks to class and qualname finders

Browse Source
This commit is contained in:
Athanasius 2020-07-24 21:32:21 +01:00
parent 7951463fba
commit 89cadbc0eb
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
EDMarketConnector.py
View File

@ -986,15 +986,15 @@ class EDMCContextFilter(logging.Filter):
if len(stack) < start + 1:
return ''
class_name = []
class_name = ''
frame = stack[start]
if 'self' in frame.f_locals:
# I don't know any way to detect call from the object method
# XXX: there seems to be no way to detect static method call - it will
# be just a function call
class_name.append(frame.f_locals['self'].__class__.__qualname__)
# Paranoia checks
frame_class = frame.f_locals['self'].__class__
if frame_class and frame_class.__qualname__:
class_name = frame_class.__qualname__
return ".".join(class_name)
return class_name
def caller_qualname(self, skip=5) -> str:
"""
@ -1019,15 +1019,16 @@ class EDMCContextFilter(logging.Filter):
if len(stack) < start + 1:
return ''
class_name = []
qualname = ''
frame = stack[start]
if 'self' in frame.f_locals:
# I don't know any way to detect call from the object method
# XXX: there seems to be no way to detect static method call - it will
# be just a function call
class_name.append(getattr(frame.f_locals['self'], frame.f_code.co_name).__qualname__)
if frame.f_locals and 'self' in frame.f_locals:
# Paranoia checks
if frame.f_code and frame.f_code.co_name:
fn = getattr(frame.f_locals['self'], frame.f_code.co_name)
if fn and fn.__qualname__:
qualname = n.__qualname__
return ".".join(class_name)
return qualname
###########################################################################