From 3327240c477115f0c721bf0e9cc5264ca6fc4de9 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 30 Sep 2016 10:32:16 +0000 Subject: [PATCH] Additional changes to the output of @debug.trace - Legacy-Id: 12060 --- debug.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/debug.py b/debug.py index 5c85e483a..c9e68c77c 100644 --- a/debug.py +++ b/debug.py @@ -54,20 +54,22 @@ def trace(fn): # renamed from 'report' by henrik 16 Jun 2011 call = wrap.callcount = wrap.callcount + 1 indent = ' ' * _report_indent[0] - fr = tb.format_stack()[-3].strip()[4:] - fi, co = [ l.strip() for l in fr.splitlines()[:2] ] - fc = "%s.%s(%s)" % (fn.__module__, fn.__name__, ', '.join( + fr = tb.format_stack()[-3].strip()[4:] # call from + fi, co = [ l.strip() for l in fr.splitlines()[:2] ] # file info, code + fu = "%s.%s()" % (fn.__module__, fn.__name__) # function name + fc = "%s(%s)" % (fn.__name__, ', '.join( # function call [fix(repr(a)) for a in params] + ["%s = %s" % (a, fix(repr(b))) for a,b in kwargs.items()] )) if debug: - sys.stderr.write("%s* From %s:\n%s | %s\n%s => %s [#%s]\n" % (indent, fi, indent, co, indent, fc, call)) + sys.stderr.write("\n%s From %s:\n%s | %s\n%s %s\n%s* %s [#%s]\n" % + (indent, fi, indent, co, indent, fu, indent, fc, call)) _report_indent[0] += increment ret = fn(*params,**kwargs) _report_indent[0] -= increment if debug: - sys.stderr.write("%s %s [#%s] ==> %s\n" % (indent, fc, call, fix(repr(ret)))) + sys.stderr.write("%s %s [#%s] ==> %s\n" % (indent, fc, call, fix(repr(ret)))) return ret wrap.callcount = 0