From e8e3f369be8d07362f6e74b9141c456247bf0078 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 7 Apr 2019 18:24:48 +0200 Subject: Avoid importing qutebrowser.utils.log globally in qutebrowser.py Otherwise, log.py tries to import QtCore, but at this early point (before running earlyinit) we shouldn't rely on PyQt being available. This restores the graphical error message shown when PyQt is missing. --- qutebrowser/qutebrowser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qutebrowser/qutebrowser.py b/qutebrowser/qutebrowser.py index 65b150b3f..1efa8b9e4 100644 --- a/qutebrowser/qutebrowser.py +++ b/qutebrowser/qutebrowser.py @@ -51,7 +51,6 @@ except ImportError: sys.stderr.flush() sys.exit(100) check_python_version() -from qutebrowser.utils import log import argparse # pylint: disable=wrong-import-order from qutebrowser.misc import earlyinit @@ -148,6 +147,7 @@ def logfilter_error(logfilter): Args: logfilter: A comma separated list of logger names. """ + from qutebrowser.utils import log if set(logfilter.lstrip('!').split(',')).issubset(log.LOGGER_NAMES): return logfilter else: -- cgit v1.2.3-54-g00ecf