diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2019-10-02 05:29:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 05:29:01 -0700 |
| commit | 864f14454322c6cba11476667ade8fc6cbea6f44 (patch) | |
| tree | c50252079f4cdf0ac2fc9c1193176590ed64e6ab /synapse/logging/utils.py | |
| parent | Fix yields and copy instead of move push rules on room upgrade (#6144) (diff) | |
| download | synapse-864f14454322c6cba11476667ade8fc6cbea6f44.tar.xz | |
Fix up some typechecking (#6150)
* type checking fixes * changelog
Diffstat (limited to 'synapse/logging/utils.py')
| -rw-r--r-- | synapse/logging/utils.py | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/synapse/logging/utils.py b/synapse/logging/utils.py index 7df0fa6087..6073fc2725 100644 --- a/synapse/logging/utils.py +++ b/synapse/logging/utils.py @@ -119,7 +119,11 @@ def trace_function(f): logger = logging.getLogger(name) level = logging.DEBUG - s = inspect.currentframe().f_back + frame = inspect.currentframe() + if frame is None: + raise Exception("Can't get current frame!") + + s = frame.f_back to_print = [ "\t%s:%s %s. Args: args=%s, kwargs=%s" @@ -144,7 +148,7 @@ def trace_function(f): pathname=pathname, lineno=lineno, msg=msg, - args=None, + args=tuple(), exc_info=None, ) @@ -157,7 +161,12 @@ def trace_function(f): def get_previous_frames(): - s = inspect.currentframe().f_back.f_back + + frame = inspect.currentframe() + if frame is None: + raise Exception("Can't get current frame!") + + s = frame.f_back.f_back to_return = [] while s: if s.f_globals["__name__"].startswith("synapse"): @@ -174,7 +183,10 @@ def get_previous_frames(): def get_previous_frame(ignore=[]): - s = inspect.currentframe().f_back.f_back + frame = inspect.currentframe() + if frame is None: + raise Exception("Can't get current frame!") + s = frame.f_back.f_back while s: if s.f_globals["__name__"].startswith("synapse"): |