From 31d798763d086d4a214a108a4ee69f4accdf16e4 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sat, 30 Apr 2022 16:22:06 +1200 Subject: Manual import fixups after isort pylint told me to fix them. Presumably the utils.py one confused isort with the try/catch above it --- qutebrowser/app.py | 11 +++++------ qutebrowser/utils/utils.py | 4 +--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 952cc70d6..64c135738 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -49,7 +49,6 @@ from typing import Iterable, Optional import qutebrowser from qutebrowser.browser import ( browsertab, - commands, downloads, greasemonkey, history, @@ -64,10 +63,6 @@ from qutebrowser.config import config, configfiles, configinit, qtargs, websetti from qutebrowser.extensions import loader from qutebrowser.keyinput import eventfilter, macros from qutebrowser.mainwindow import mainwindow, prompt, windowundo - -# pylint: disable=unused-import -# We import those to run the cmdutils.register decorators. -from qutebrowser.mainwindow.statusbar import command from qutebrowser.misc import ( backendproblem, cmdhistory, @@ -79,7 +74,6 @@ from qutebrowser.misc import ( savemanager, sessions, sql, - utilcmds, ) from qutebrowser.qt import QtCore, QtGui, QtWidgets from qutebrowser.utils import ( @@ -97,6 +91,11 @@ from qutebrowser.utils import ( version, ) +# pylint: disable=unused-import +# We import those to run the cmdutils.register decorators. +from qutebrowser.browser import commands # isort:skip +from qutebrowser.mainwindow.statusbar import command # isort:skip +from qutebrowser.misc import utilcmds # isort:skip # pylint: enable=unused-import diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py index 0650bcb18..d572f87dc 100644 --- a/qutebrowser/utils/utils.py +++ b/qutebrowser/utils/utils.py @@ -58,8 +58,6 @@ except ImportError: # pragma: no cover import yaml -from qutebrowser.qt import QtWidgets - try: from yaml import CSafeDumper as YamlDumper from yaml import CSafeLoader as YamlLoader @@ -69,7 +67,7 @@ except ImportError: # pragma: no cover from yaml import SafeLoader as YamlLoader # type: ignore[misc] YAML_C_EXT = False -from qutebrowser.qt import QtCore, QtGui +from qutebrowser.qt import QtCore, QtGui, QtWidgets from qutebrowser.utils import log fake_clipboard = None -- cgit v1.2.3-54-g00ecf