diff options
| author | Florian Bruhin <me@the-compiler.org> | 2019-04-07 18:24:48 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2019-04-07 18:26:16 +0200 |
| commit | e8e3f369be8d07362f6e74b9141c456247bf0078 (patch) | |
| tree | 61a033b20b22cb4b3056373f3d4439e9784c10a4 | |
| parent | 92e68951e605240513ef3e6e70e708ce3a647cfd (diff) | |
| download | qutebrowser-e8e3f369be8d07362f6e74b9141c456247bf0078.tar.gz qutebrowser-e8e3f369be8d07362f6e74b9141c456247bf0078.zip | |
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.
| -rw-r--r-- | qutebrowser/qutebrowser.py | 2 |
1 files changed, 1 insertions, 1 deletions
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: |