From 250143a70aeae5b7df7400577bc5b03f2eeb692b Mon Sep 17 00:00:00 2001 From: Philipp Albrecht Date: Fri, 14 Jul 2023 10:40:05 +0200 Subject: Move qt logger from qtlog to log This resolves a temporary workaround for a circular import. Now that we fully separated `qutebrowser.utils.log` and `qutebrowser.utils.qtlog`, we can go back to keeping all logger definitions in the same place. --- qutebrowser/utils/log.py | 1 + qutebrowser/utils/qtlog.py | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/qutebrowser/utils/log.py b/qutebrowser/utils/log.py index ece0bd5e0..7542dbd30 100644 --- a/qutebrowser/utils/log.py +++ b/qutebrowser/utils/log.py @@ -128,6 +128,7 @@ hints = logging.getLogger('hints') keyboard = logging.getLogger('keyboard') downloads = logging.getLogger('downloads') js = logging.getLogger('js') # Javascript console messages +qt = logging.getLogger('qt') # Warnings produced by Qt ipc = logging.getLogger('ipc') shlexer = logging.getLogger('shlexer') save = logging.getLogger('save') diff --git a/qutebrowser/utils/qtlog.py b/qutebrowser/utils/qtlog.py index 2e3c21668..15e124b79 100644 --- a/qutebrowser/utils/qtlog.py +++ b/qutebrowser/utils/qtlog.py @@ -26,10 +26,8 @@ import traceback from typing import Iterator, Optional, Callable, cast from qutebrowser.qt import core as qtcore, machinery +from qutebrowser.utils import log -# FIXME(pylbrecht): move this back to qutebrowser.utils.log once `qtlog.init()` is -# extracted from `qutebrowser.utils.log.init_log()` -qt = logging.getLogger('qt') # Warnings produced by Qt _args = None @@ -207,10 +205,10 @@ def qt_message_handler(msg_type: qtcore.QtMsgType, else: stack = None - record = qt.makeRecord(name=name, level=level, fn=context.file, lno=lineno, + record = log.qt.makeRecord(name=name, level=level, fn=context.file, lno=lineno, msg=msg, args=(), exc_info=None, func=func, sinfo=stack) - qt.handle(record) + log.qt.handle(record) class QtWarningFilter(logging.Filter): -- cgit v1.2.3-54-g00ecf