From 4d0649a825f270bd8beeb6e24ab4856dbd4973e0 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 3 Jun 2014 06:54:55 +0200 Subject: [PATCH] Let qt function parsing be more forgiving --- qutebrowser/utils/log.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qutebrowser/utils/log.py b/qutebrowser/utils/log.py index 876f33067..e86543edf 100644 --- a/qutebrowser/utils/log.py +++ b/qutebrowser/utils/log.py @@ -137,7 +137,11 @@ def qt_message_handler(msg_type, context, msg): return # We get something like "void qt_png_warning(png_structp, png_const_charp)" # from Qt, but only want "qt_png_warning". - func = re.match(r'\w* (\w*)\(.*\)', context.function).group(1) + match = re.match(r'\w* (\w*)\(.*\)', context.function) + if match is not None: + func = match.group(1) + else: + func = context.function name = 'qt' if context.category == 'default' else 'qt-' + context.category record = qt.makeRecord(name, QT_TO_LOGGING[msg_type], context.file, context.line, msg, None, None, func)