From d7b420dc4b18cac3a09bb11af3a6e9f1005e6af8 Mon Sep 17 00:00:00 2001 From: Philipp Albrecht Date: Tue, 18 Jul 2023 07:42:25 +0200 Subject: Log machinery info in machinery.init() Now that we moved all Qt related things out of `qutebrowser.utils.log` we can import `qutebrowser.utils.log` in `qutebrowser.qt.machinery`, and therefore move the machinery log where it belongs. --- qutebrowser/misc/earlyinit.py | 1 - qutebrowser/qt/machinery.py | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py index bf6da7b74..72cc7b3f5 100644 --- a/qutebrowser/misc/earlyinit.py +++ b/qutebrowser/misc/earlyinit.py @@ -299,7 +299,6 @@ def init_log(args): log.init_log(args) qtlog.init(args) log.init.debug("Log initialized.") - log.init.debug(str(machinery.INFO)) def check_optimize_flag(): diff --git a/qutebrowser/qt/machinery.py b/qutebrowser/qt/machinery.py index 4e88a0634..e626edcb4 100644 --- a/qutebrowser/qt/machinery.py +++ b/qutebrowser/qt/machinery.py @@ -18,6 +18,8 @@ import importlib import dataclasses from typing import Optional, Dict +from qutebrowser.utils import log + # Packagers: Patch the line below to change the default wrapper for Qt 6 packages, e.g.: # sed -i 's/_DEFAULT_WRAPPER = "PyQt5"/_DEFAULT_WRAPPER = "PyQt6"/' qutebrowser/qt/machinery.py # @@ -280,6 +282,7 @@ def init(args: argparse.Namespace) -> SelectionInfo: info = _select_wrapper(args) if info.wrapper is not None: _set_globals(info) + log.init.debug(str(info)) # If info is None here (no Qt wrapper available), we'll show an error later # in earlyinit.py. -- cgit v1.2.3-54-g00ecf