diff options
| author | Philipp Albrecht <palbrecht@mailbox.org> | 2023-07-07 14:54:03 +0200 |
|---|---|---|
| committer | Philipp Albrecht <palbrecht@mailbox.org> | 2023-07-20 15:09:05 +0200 |
| commit | 1e0fb604ae59366b8576f675537a9d67b2c70c16 (patch) | |
| tree | 1cbe7195ff58469f8ac830faf4e7c0500dd09de8 | |
| parent | b5b43a566e21171cd342a5b1062f9dd5fd916d9b (diff) | |
| download | qutebrowser-1e0fb604ae59366b8576f675537a9d67b2c70c16.tar.gz qutebrowser-1e0fb604ae59366b8576f675537a9d67b2c70c16.zip | |
Move shutdown_log() to qtlog
| -rw-r--r-- | qutebrowser/misc/quitter.py | 4 | ||||
| -rw-r--r-- | qutebrowser/utils/log.py | 5 | ||||
| -rw-r--r-- | qutebrowser/utils/qtlog.py | 8 |
3 files changed, 10 insertions, 7 deletions
diff --git a/qutebrowser/misc/quitter.py b/qutebrowser/misc/quitter.py index d502efa65..59e2d552f 100644 --- a/qutebrowser/misc/quitter.py +++ b/qutebrowser/misc/quitter.py @@ -37,7 +37,7 @@ except ImportError: import qutebrowser from qutebrowser.api import cmdutils -from qutebrowser.utils import log +from qutebrowser.utils import log, qtlog from qutebrowser.misc import sessions, ipc, objects from qutebrowser.mainwindow import prompt from qutebrowser.completion.models import miscmodels @@ -304,5 +304,5 @@ def init(args: argparse.Namespace) -> None: """Initialize the global Quitter instance.""" global instance instance = Quitter(args=args, parent=objects.qapp) - instance.shutting_down.connect(log.shutdown_log) + instance.shutting_down.connect(qtlog.shutdown_log) objects.qapp.lastWindowClosed.connect(instance.on_last_window_closed) diff --git a/qutebrowser/utils/log.py b/qutebrowser/utils/log.py index 5ac150702..e5894dda8 100644 --- a/qutebrowser/utils/log.py +++ b/qutebrowser/utils/log.py @@ -213,11 +213,6 @@ def init_log(args: argparse.Namespace) -> None: _log_inited = True -@qtcore.pyqtSlot() -def shutdown_log() -> None: - qtcore.qInstallMessageHandler(None) - - def _init_py_warnings() -> None: """Initialize Python warning handling.""" assert _args is not None diff --git a/qutebrowser/utils/qtlog.py b/qutebrowser/utils/qtlog.py index d2f14e5c1..2bf10f07b 100644 --- a/qutebrowser/utils/qtlog.py +++ b/qutebrowser/utils/qtlog.py @@ -16,3 +16,11 @@ # along with qutebrowser. If not, see <https://www.gnu.org/licenses/>. """Loggers and utilities related to Qt logging.""" + + +from qutebrowser.qt import core as qtcore + + +@qtcore.pyqtSlot() +def shutdown_log() -> None: + qtcore.qInstallMessageHandler(None) |