diff options
author | Florian Bruhin <me@the-compiler.org> | 2023-06-29 23:31:14 +0200 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2023-06-29 23:31:14 +0200 |
commit | 783963b4dae644ef79f3d24a7f98b4c43e2b20e3 (patch) | |
tree | aaf83eeda580849cd5e47127c406fe1ab29d2688 /qutebrowser | |
parent | 41f374a6625fa773ce9440d1e0eef4d155e51f9c (diff) | |
download | qutebrowser-783963b4dae644ef79f3d24a7f98b4c43e2b20e3.tar.gz qutebrowser-783963b4dae644ef79f3d24a7f98b4c43e2b20e3.zip |
Fix lint
Diffstat (limited to 'qutebrowser')
-rw-r--r-- | qutebrowser/browser/browsertab.py | 1 | ||||
-rw-r--r-- | qutebrowser/browser/webengine/webenginetab.py | 6 | ||||
-rw-r--r-- | qutebrowser/browser/webkit/webview.py | 2 | ||||
-rw-r--r-- | qutebrowser/qt/_core_pyqtproperty.py | 33 | ||||
-rw-r--r-- | qutebrowser/utils/version.py | 3 |
5 files changed, 25 insertions, 20 deletions
diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py index ea4cf8004..060f8af0d 100644 --- a/qutebrowser/browser/browsertab.py +++ b/qutebrowser/browser/browsertab.py @@ -1339,6 +1339,7 @@ class AbstractTab(QWidget): return utils.get_repr(self, tab_id=self.tab_id, url=url) def is_deleted(self) -> bool: + """Check if the tab has been deleted.""" assert self._widget is not None # FIXME:v4 cast needed for QtWebKit if machinery.IS_QT6: diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index 6080a974d..37684e6eb 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -107,9 +107,9 @@ class WebEnginePrinting(browsertab.AbstractPrinting): if machinery.IS_QT5: - _FIND_FLAG_T = Union[QWebEnginePage.FindFlag, QWebEnginePage.FindFlags] + _FindFlagType = Union[QWebEnginePage.FindFlag, QWebEnginePage.FindFlags] else: - _FIND_FLAG_T = QWebEnginePage.FindFlag + _FindFlagType = QWebEnginePage.FindFlag @dataclasses.dataclass @@ -120,7 +120,7 @@ class _FindFlags: def to_qt(self): """Convert flags into Qt flags.""" - flags: _FIND_FLAG_T = QWebEnginePage.FindFlag(0) + flags: _FindFlagType = QWebEnginePage.FindFlag(0) if self.case_sensitive: flags |= QWebEnginePage.FindFlag.FindCaseSensitively if self.backward: diff --git a/qutebrowser/browser/webkit/webview.py b/qutebrowser/browser/webkit/webview.py index 16535e47f..6917a4af5 100644 --- a/qutebrowser/browser/webkit/webview.py +++ b/qutebrowser/browser/webkit/webview.py @@ -22,7 +22,7 @@ """The main browser widgets.""" -from qutebrowser.qt.core import pyqtSignal, Qt, QUrl +from qutebrowser.qt.core import pyqtSignal, Qt from qutebrowser.qt.webkit import QWebSettings from qutebrowser.qt.webkitwidgets import QWebView, QWebPage diff --git a/qutebrowser/qt/_core_pyqtproperty.py b/qutebrowser/qt/_core_pyqtproperty.py index 7f89b8e5b..c6943cc78 100644 --- a/qutebrowser/qt/_core_pyqtproperty.py +++ b/qutebrowser/qt/_core_pyqtproperty.py @@ -1,33 +1,38 @@ # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et: -""" -# FIXME:mypy PyQt6-stubs issue -# WORKAROUND for missing pyqtProperty typing, ported from PyQt5-stubs: -# https://github.com/python-qt-tools/PyQt5-stubs/blob/5.15.6.0/PyQt5-stubs/QtCore.pyi#L70-L111 +"""WORKAROUND for missing pyqtProperty typing, ported from PyQt5-stubs: + +FIXME:mypy PyQt6-stubs issue +https://github.com/python-qt-tools/PyQt5-stubs/blob/5.15.6.0/PyQt5-stubs/QtCore.pyi#L70-L111 """ # flake8: noqa -# pylint: disable=invalid-name,undefined-variable,too-many-arguments,redefined-builtin,unused-argument +# pylint: disable=invalid-name,missing-class-docstring,too-many-arguments,redefined-builtin,unused-argument,import-error import typing from PyQt6.QtCore import QObjectT, pyqtSignal if typing.TYPE_CHECKING: + TPropertyTypeVal = typing.TypeVar("TPropertyTypeVal") - TPropertyTypeVal = typing.TypeVar('TPropertyTypeVal') - - TPropGetter = typing.TypeVar('TPropGetter', bound=typing.Callable[[QObjectT], TPropertyTypeVal]) - TPropSetter = typing.TypeVar('TPropSetter', bound=typing.Callable[[QObjectT, TPropertyTypeVal], None]) - TPropDeleter = typing.TypeVar('TPropDeleter', bound=typing.Callable[[QObjectT], None]) - TPropResetter = typing.TypeVar('TPropResetter', bound=typing.Callable[[QObjectT], None]) + TPropGetter = typing.TypeVar( + "TPropGetter", bound=typing.Callable[[QObjectT], TPropertyTypeVal] + ) + TPropSetter = typing.TypeVar( + "TPropSetter", bound=typing.Callable[[QObjectT, TPropertyTypeVal], None] + ) + TPropDeleter = typing.TypeVar( + "TPropDeleter", bound=typing.Callable[[QObjectT], None] + ) + TPropResetter = typing.TypeVar( + "TPropResetter", bound=typing.Callable[[QObjectT], None] + ) class pyqtProperty: def __init__( self, type: typing.Union[type, str], - fget: typing.Optional[ - typing.Callable[[QObjectT], TPropertyTypeVal] - ] = None, + fget: typing.Optional[typing.Callable[[QObjectT], TPropertyTypeVal]] = None, fset: typing.Optional[ typing.Callable[[QObjectT, TPropertyTypeVal], None] ] = None, diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index e0ed51023..cfe790563 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -1044,8 +1044,7 @@ def opengl_info() -> Optional[OpenGLInfo]: # pragma: no cover return None if vf is None: - log.init.debug( # type: ignore[unreachable,unused-ignore] - "Getting version functions failed!") + log.init.debug("Getting version functions failed!") return None # FIXME:mypy PyQt6-stubs issue? |