summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJimmy <jimmy@spalge.com>2022-04-30 18:07:25 +1200
committerJimmy <jimmy@spalge.com>2022-04-30 19:31:14 +1200
commit3a305cdfd9c683bbeefd240e6c5ccec83f8c5b25 (patch)
tree3b16996bad60af14031cffd8b29511deb033216f
parent180da6eb6229cce75876b9f5116f3471561a8467 (diff)
downloadqutebrowser-feat/pyqt_wrapper_bulk_import_rewrite.tar.gz
qutebrowser-feat/pyqt_wrapper_bulk_import_rewrite.zip
Workaround import loops that isort madefeat/pyqt_wrapper_bulk_import_rewrite
The type hint one could probably resolved with annotations from the future. The inspector/miscwidgets one will probably need refactoring.
-rw-r--r--qutebrowser/browser/browsertab.py4
-rw-r--r--qutebrowser/keyinput/modeparsers.py4
2 files changed, 5 insertions, 3 deletions
diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index a959577a7..0ed237f20 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -42,10 +42,12 @@ from qutebrowser.qt import QtNetwork, QtPrintSupport, QtWidgets
if TYPE_CHECKING:
from qutebrowser.qt import QtWebKit, QtWebKitWidgets, QtWebEngineWidgets
+# need to import miscwidgets ahead of inspector to prevent and import loop
+from qutebrowser.misc import miscwidgets # isort:skip
from qutebrowser.browser import eventfilter, inspector
from qutebrowser.config import config
from qutebrowser.keyinput import modeman
-from qutebrowser.misc import miscwidgets, objects, sessions
+from qutebrowser.misc import objects, sessions
from qutebrowser.qt import QtCore, QtGui, sip
from qutebrowser.utils import (
jinja,
diff --git a/qutebrowser/keyinput/modeparsers.py b/qutebrowser/keyinput/modeparsers.py
index f4c2feb31..6ebbc73a6 100644
--- a/qutebrowser/keyinput/modeparsers.py
+++ b/qutebrowser/keyinput/modeparsers.py
@@ -27,7 +27,6 @@ import enum
import traceback
from typing import TYPE_CHECKING, Sequence
-from qutebrowser.browser import hints
from qutebrowser.commands import cmdexc
from qutebrowser.config import config
from qutebrowser.keyinput import basekeyparser, keyutils, macros
@@ -35,6 +34,7 @@ from qutebrowser.qt import QtCore, QtGui
from qutebrowser.utils import log, message, objreg, usertypes, utils
if TYPE_CHECKING:
+ from qutebrowser.browser import hints
from qutebrowser.commands import runners
@@ -180,7 +180,7 @@ class HintKeyParser(basekeyparser.BaseKeyParser):
*,
win_id: int,
commandrunner: 'runners.CommandRunner',
- hintmanager: hints.HintManager,
+ hintmanager: 'hints.HintManager',
parent: QtCore.QObject = None
) -> None:
super().__init__(