Additional changes to the output of @debug.trace

 - Legacy-Id: 12060

Author: levkowetz

debug.py

@@ -54,20 +54,22 @@ def wrap(fn, *params,**kwargs):
         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