diff options
| author | Jay Kamat <jaygkamat@gmail.com> | 2019-07-03 17:37:37 -0700 |
|---|---|---|
| committer | Jay Kamat <jaygkamat@gmail.com> | 2019-07-03 17:37:37 -0700 |
| commit | 76c3de4b8479e309f0d899ba163eb2d09df2b15a (patch) | |
| tree | 558104d2bb66833f78b54bbb4958c11df323db5e /qutebrowser/qutebrowser.py | |
| parent | f35eba0d60b0150c3a1fdf6352a958d0882b3286 (diff) | |
| parent | 012f11ab31146f4fce9a5d9fc67c5ef86986d90a (diff) | |
| download | qutebrowser-76c3de4b8479e309f0d899ba163eb2d09df2b15a.tar.gz qutebrowser-76c3de4b8479e309f0d899ba163eb2d09df2b15a.zip | |
Merge branch 'master' of https://github.com/qutebrowser/qutebrowser into config-cli-option
Diffstat (limited to 'qutebrowser/qutebrowser.py')
| -rw-r--r-- | qutebrowser/qutebrowser.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/qutebrowser/qutebrowser.py b/qutebrowser/qutebrowser.py index a96a18121..fe846d489 100644 --- a/qutebrowser/qutebrowser.py +++ b/qutebrowser/qutebrowser.py @@ -1,6 +1,6 @@ # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et: -# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org> +# Copyright 2014-2019 Florian Bruhin (The Compiler) <mail@qutebrowser.org> # This file is part of qutebrowser. # @@ -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 @@ -149,6 +148,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: @@ -166,9 +166,12 @@ def debug_flag_error(flag): no-sql-history: Don't store history items. no-scroll-filtering: Process all scrolling updates. log-requests: Log all network requests. + stack: Enable Chromium stack logging. + chromium: Enable Chromium logging. """ valid_flags = ['debug-exit', 'pdb-postmortem', 'no-sql-history', - 'no-scroll-filtering', 'log-requests', 'lost-focusproxy'] + 'no-scroll-filtering', 'log-requests', 'lost-focusproxy', + 'stack', 'chromium'] if flag in valid_flags: return flag |