From 111944fb655bc34776e3ae8ad1a556fe10b6d498 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 24 Apr 2017 23:15:34 +0200 Subject: [PATCH] Revert "Raise exception when a stylesheet is unparsable." This reverts commit 0400945ac4c3b31dd476e2f8727f75d895a09378. See #2571 --- CHANGELOG.asciidoc | 1 + qutebrowser/utils/log.py | 17 +---------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index a86dc2669..dd27c434b 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -61,6 +61,7 @@ Fixed - Crash when the key config isn't writable - Crash when unbinding an unbound key in the key config - Crash when using `:debug-log-filter` when `--filter` wasn't given on startup. +- Crash with some invalid setting values - Various rare crashes v0.10.1 diff --git a/qutebrowser/utils/log.py b/qutebrowser/utils/log.py index 9c660f035..19b4f506f 100644 --- a/qutebrowser/utils/log.py +++ b/qutebrowser/utils/log.py @@ -161,11 +161,6 @@ def stub(suffix=''): misc.warning(text) -class CriticalQtWarning(Exception): - - """Exception raised when there's a critical Qt warning.""" - - def init_log(args): """Init loggers based on the argparse namespace passed.""" level = args.loglevel.upper() @@ -424,17 +419,7 @@ def qt_message_handler(msg_type, context, msg): 'with: -9805', # flake8: disable=E131 ] - # Messages which will trigger an exception immediately - critical_msgs = [ - 'Could not parse stylesheet of object', - ] - - if any(msg.strip().startswith(pattern) for pattern in critical_msgs): - # For some reason, the stack gets lost when raising here... - logger = logging.getLogger('misc') - logger.error("Got critical Qt warning!", stack_info=True) - raise CriticalQtWarning(msg) - elif any(msg.strip().startswith(pattern) for pattern in suppressed_msgs): + if any(msg.strip().startswith(pattern) for pattern in suppressed_msgs): level = logging.DEBUG else: level = qt_to_logging[msg_type]