From 2ac6b0768b04ad2deed7e24dfe52a2d4c42cf704 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 29 Jun 2023 14:19:52 +0200 Subject: qt6 mypy: Fix first batch of various issues 50 -> 39 errors --- qutebrowser/browser/browsertab.py | 11 ++++++++--- qutebrowser/mainwindow/statusbar/bar.py | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py index 7ec259d20..27b696e37 100644 --- a/qutebrowser/browser/browsertab.py +++ b/qutebrowser/browser/browsertab.py @@ -1069,8 +1069,11 @@ class AbstractTab(QWidget): def _set_widget(self, widget: Union["QWebView", "QWebEngineView"]) -> None: # pylint: disable=protected-access self._widget = widget + # FIXME:v4 ignore needed for QtWebKit self.data.splitter = miscwidgets.InspectorSplitter( - win_id=self.win_id, main_webview=widget) + win_id=self.win_id, + main_webview=widget, # type: ignore[arg-type] + ) self._layout.wrap(self, self.data.splitter) self.history._history = widget.history() self.history.private_api._history = widget.history() @@ -1177,7 +1180,8 @@ class AbstractTab(QWidget): @pyqtSlot(bool) def _on_load_finished(self, ok: bool) -> None: assert self._widget is not None - if sip.isdeleted(self._widget): + # FIXME:mypy PyQt6-stubs issue? + if sip.isdeleted(self._widget): # type: ignore[arg-type] # https://github.com/qutebrowser/qutebrowser/issues/3498 return @@ -1333,4 +1337,5 @@ class AbstractTab(QWidget): def is_deleted(self) -> bool: assert self._widget is not None - return sip.isdeleted(self._widget) + # FIXME:mypy PyQt6-stubs issue? + return sip.isdeleted(self._widget) # type: ignore[arg-type] diff --git a/qutebrowser/mainwindow/statusbar/bar.py b/qutebrowser/mainwindow/statusbar/bar.py index 26ff4a340..92e77df2f 100644 --- a/qutebrowser/mainwindow/statusbar/bar.py +++ b/qutebrowser/mainwindow/statusbar/bar.py @@ -22,8 +22,8 @@ import enum import dataclasses -from qutebrowser.qt.core import pyqtSignal, pyqtSlot, Qt, QSize, QTimer -from qutebrowser.qt.core import pyqtProperty # type: ignore[attr-defined] +from qutebrowser.qt.core import pyqtSignal, pyqtProperty, pyqtSlot, Qt, QSize, QTimer +from qutebrowser.qt.core import pyqtProperty from qutebrowser.qt.widgets import QWidget, QHBoxLayout, QStackedLayout, QSizePolicy from qutebrowser.browser import browsertab -- cgit v1.2.3-54-g00ecf