From c04ad1de4517dd35cbfaa93a72a8f8c719d84395 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 31 Jul 2014 23:03:49 +0200 Subject: [PATCH] utils.debug.trace_lines: Improve output --- qutebrowser/utils/debug.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/qutebrowser/utils/debug.py b/qutebrowser/utils/debug.py index 1ebd2f72f..aaa6d224e 100644 --- a/qutebrowser/utils/debug.py +++ b/qutebrowser/utils/debug.py @@ -27,7 +27,7 @@ from functools import wraps from PyQt5.QtCore import pyqtRemoveInputHook, QEvent, QCoreApplication -from qutebrowser.utils.misc import elide +from qutebrowser.utils.misc import elide, compact_text from qutebrowser.utils.log import misc as logger import qutebrowser.commands.utils as cmdutils @@ -106,15 +106,19 @@ def trace_lines(do_trace): Args: do_trace: Whether to start tracing (True) or stop it (False). """ - def trace(frame, event, _): + def trace(frame, event, arg): """Trace function passed to sys.settrace. Return: Itself, so tracing continues. """ if sys is not None: - print("{}, {}:{}".format(event, frame.f_code.co_filename, - frame.f_lineno), file=sys.stderr) + loc = '{}:{}'.format(frame.f_code.co_filename, frame.f_lineno) + if arg is not None: + arg = compact_text(str(arg), 200) + else: + arg = '' + print("{:11} {:80} {}".format(event, loc, arg), file=sys.stderr) return trace else: # When tracing while shutting down, it seems sys can be None