diff options
author | Florian Bruhin <me@the-compiler.org> | 2022-05-17 13:01:22 +0200 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2022-06-22 17:41:12 +0200 |
commit | b776497bda1c6059fc2d4db4a1881a65199bece1 (patch) | |
tree | 7cf6e03b2208d04e9de6ecec1a08828eb28377b2 | |
parent | 1c9f93c4a66b8b1035fbba5b683c6592950cb40e (diff) | |
download | qutebrowser-b776497bda1c6059fc2d4db4a1881a65199bece1.tar.gz qutebrowser-b776497bda1c6059fc2d4db4a1881a65199bece1.zip |
lint: Fix flake8 QtCore imports
-rw-r--r-- | qutebrowser/misc/earlyinit.py | 4 | ||||
-rw-r--r-- | qutebrowser/utils/log.py | 26 | ||||
-rw-r--r-- | tests/unit/utils/test_log.py | 6 |
3 files changed, 18 insertions, 18 deletions
diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py index d60f96a7c..b142c93fe 100644 --- a/qutebrowser/misc/earlyinit.py +++ b/qutebrowser/misc/earlyinit.py @@ -250,8 +250,8 @@ def configure_pyqt(): Doing this means we can't use the interactive shell anymore (which we don't anyways), but we can use pdb instead. """ - from qutebrowser.qt import core as QtCore - QtCore.pyqtRemoveInputHook() + from qutebrowser.qt.core import pyqtRemoveInputHook + pyqtRemoveInputHook() from qutebrowser.qt import sip try: diff --git a/qutebrowser/utils/log.py b/qutebrowser/utils/log.py index e8b386eda..ab94aa40d 100644 --- a/qutebrowser/utils/log.py +++ b/qutebrowser/utils/log.py @@ -35,7 +35,7 @@ import argparse from typing import (TYPE_CHECKING, Any, Iterator, Mapping, MutableSequence, Optional, Set, Tuple, Union) -from qutebrowser.qt import core as QtCore +from qutebrowser.qt import core as qtcore # Optional imports try: import colorama @@ -211,13 +211,13 @@ def init_log(args: argparse.Namespace) -> None: root.setLevel(logging.NOTSET) logging.captureWarnings(True) _init_py_warnings() - QtCore.qInstallMessageHandler(qt_message_handler) + qtcore.qInstallMessageHandler(qt_message_handler) _log_inited = True -@QtCore.pyqtSlot() +@qtcore.pyqtSlot() def shutdown_log() -> None: - QtCore.qInstallMessageHandler(None) + qtcore.qInstallMessageHandler(None) def _init_py_warnings() -> None: @@ -236,11 +236,11 @@ def _init_py_warnings() -> None: @contextlib.contextmanager def disable_qt_msghandler() -> Iterator[None]: """Contextmanager which temporarily disables the Qt message handler.""" - old_handler = QtCore.qInstallMessageHandler(None) + old_handler = qtcore.qInstallMessageHandler(None) try: yield finally: - QtCore.qInstallMessageHandler(old_handler) + qtcore.qInstallMessageHandler(old_handler) @contextlib.contextmanager @@ -378,8 +378,8 @@ def change_console_formatter(level: int) -> None: assert isinstance(old_formatter, JSONFormatter), old_formatter -def qt_message_handler(msg_type: QtCore.QtMsgType, - context: QtCore.QMessageLogContext, +def qt_message_handler(msg_type: qtcore.QtMsgType, + context: qtcore.QMessageLogContext, msg: str) -> None: """Qt message handler to redirect qWarning etc. to the logging system. @@ -392,11 +392,11 @@ def qt_message_handler(msg_type: QtCore.QtMsgType, # Note we map critical to ERROR as it's actually "just" an error, and fatal # to critical. qt_to_logging = { - QtCore.QtMsgType.QtDebugMsg: logging.DEBUG, - QtCore.QtMsgType.QtWarningMsg: logging.WARNING, - QtCore.QtMsgType.QtCriticalMsg: logging.ERROR, - QtCore.QtMsgType.QtFatalMsg: logging.CRITICAL, - QtCore.QtMsgType.QtInfoMsg: logging.INFO, + qtcore.QtMsgType.QtDebugMsg: logging.DEBUG, + qtcore.QtMsgType.QtWarningMsg: logging.WARNING, + qtcore.QtMsgType.QtCriticalMsg: logging.ERROR, + qtcore.QtMsgType.QtFatalMsg: logging.CRITICAL, + qtcore.QtMsgType.QtInfoMsg: logging.INFO, } # Change levels of some well-known messages to debug so they don't get diff --git a/tests/unit/utils/test_log.py b/tests/unit/utils/test_log.py index 6865e6e0d..921d354d1 100644 --- a/tests/unit/utils/test_log.py +++ b/tests/unit/utils/test_log.py @@ -28,7 +28,7 @@ import dataclasses import pytest import _pytest.logging # pylint: disable=import-private-name -from qutebrowser.qt import core as QtCore +from qutebrowser.qt import core as qtcore from qutebrowser import qutebrowser from qutebrowser.utils import log @@ -243,7 +243,7 @@ class TestInitLog: @pytest.fixture(autouse=True) def setup(self, mocker): - mocker.patch('qutebrowser.utils.log.QtCore.qInstallMessageHandler', + mocker.patch('qutebrowser.utils.log.qtcore.qInstallMessageHandler', autospec=True) yield # Make sure logging is in a sensible default state @@ -429,5 +429,5 @@ class TestQtMessageHandler: def test_empty_message(self, caplog): """Make sure there's no crash with an empty message.""" - log.qt_message_handler(QtCore.QtMsgType.QtDebugMsg, self.Context(), "") + log.qt_message_handler(qtcore.QtMsgType.QtDebugMsg, self.Context(), "") assert caplog.messages == ["Logged empty message!"] |