diff options
author | Jay Kamat <jaygkamat@gmail.com> | 2019-04-09 22:33:40 -0700 |
---|---|---|
committer | Jay Kamat <jaygkamat@gmail.com> | 2019-04-09 22:33:40 -0700 |
commit | 4a0e0ec020d406d549bea8578af52aa3f1528571 (patch) | |
tree | c953873bd91329d844f8ba93eeab2742c8467802 /qutebrowser/qutebrowser.py | |
parent | 33f2657ce0ef048f7f2011015f0db05417d138d2 (diff) | |
parent | 9ae26e63feef55f7ed1da786c466a10db3652a60 (diff) | |
download | qutebrowser-4a0e0ec020d406d549bea8578af52aa3f1528571.tar.gz qutebrowser-4a0e0ec020d406d549bea8578af52aa3f1528571.zip |
Merge branch 'master' of https://github.com/qutebrowser/qutebrowser into jay/private-window
Diffstat (limited to 'qutebrowser/qutebrowser.py')
-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 1fb3238df..afc87c65a 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: |