diff options
author | Florian Bruhin <me@the-compiler.org> | 2020-10-02 23:37:31 +0200 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2020-10-02 23:38:23 +0200 |
commit | d7ecaf2c53ba4100e9c42e98db32be92b426d442 (patch) | |
tree | ae6ae4ae5cbd00f8ae0001bded7328a8592171a4 | |
parent | a1131f41a9b6f14b8753e941af264259d1225283 (diff) | |
download | qutebrowser-d7ecaf2c53ba4100e9c42e98db32be92b426d442.tar.gz qutebrowser-d7ecaf2c53ba4100e9c42e98db32be92b426d442.zip |
mypy: Fix type annotations for bound PyQt signals
-rw-r--r-- | qutebrowser/browser/signalfilter.py | 2 | ||||
-rw-r--r-- | qutebrowser/mainwindow/mainwindow.py | 4 | ||||
-rw-r--r-- | qutebrowser/utils/debug.py | 12 | ||||
-rw-r--r-- | qutebrowser/utils/message.py | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/qutebrowser/browser/signalfilter.py b/qutebrowser/browser/signalfilter.py index b70deb165..348a7a2ff 100644 --- a/qutebrowser/browser/signalfilter.py +++ b/qutebrowser/browser/signalfilter.py @@ -50,7 +50,7 @@ class SignalFilter(QObject): """Factory for partial _filter_signals functions. Args: - signal: The pyqtSignal to filter. + signal: The pyqtBoundSignal to filter. tab: The WebView to create filters for. Return: diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py index a6e36c3eb..87fd38ea1 100644 --- a/qutebrowser/mainwindow/mainwindow.py +++ b/qutebrowser/mainwindow/mainwindow.py @@ -25,7 +25,7 @@ import itertools import functools import typing -from PyQt5.QtCore import (pyqtSignal, pyqtSlot, QRect, QPoint, QTimer, Qt, +from PyQt5.QtCore import (pyqtBoundSignal, pyqtSlot, QRect, QPoint, QTimer, Qt, QCoreApplication, QEventLoop, QByteArray) from PyQt5.QtWidgets import QWidget, QVBoxLayout, QApplication, QSizePolicy from PyQt5.QtGui import QPalette @@ -118,7 +118,7 @@ def get_target_window(): return None -_OverlayInfoType = typing.Tuple[QWidget, pyqtSignal, bool, str] +_OverlayInfoType = typing.Tuple[QWidget, pyqtBoundSignal, bool, str] class MainWindow(QWidget): diff --git a/qutebrowser/utils/debug.py b/qutebrowser/utils/debug.py index 66cfeed9e..9b528854e 100644 --- a/qutebrowser/utils/debug.py +++ b/qutebrowser/utils/debug.py @@ -27,7 +27,7 @@ import datetime import typing import types -from PyQt5.QtCore import Qt, QEvent, QMetaMethod, QObject, pyqtSignal +from PyQt5.QtCore import Qt, QEvent, QMetaMethod, QObject, pyqtBoundSignal from PyQt5.QtWidgets import QApplication from qutebrowser.utils import log, utils, qtutils, objreg @@ -54,7 +54,7 @@ def log_signals(obj: QObject) -> QObject: Can be used as class decorator. """ - def log_slot(obj: QObject, signal: pyqtSignal, *args: typing.Any) -> None: + def log_slot(obj: QObject, signal: pyqtBoundSignal, *args: typing.Any) -> None: """Slot connected to a signal to log it.""" dbg = dbg_signal(signal, args) try: @@ -188,7 +188,7 @@ def qflags_key(base: typing.Type, return '|'.join(names) -def signal_name(sig: pyqtSignal) -> str: +def signal_name(sig: pyqtBoundSignal) -> str: """Get a cleaned up name of a signal. Unfortunately, the way to get the name of a signal differs based on: @@ -199,7 +199,7 @@ def signal_name(sig: pyqtSignal) -> str: fails, extract it from the repr(). Args: - sig: The pyqtSignal + sig: A bound signal. Return: The cleaned up signal name. @@ -251,11 +251,11 @@ def format_args(args: typing.Sequence = None, return ', '.join(arglist) -def dbg_signal(sig: pyqtSignal, args: typing.Any) -> str: +def dbg_signal(sig: pyqtBoundSignal, args: typing.Any) -> str: """Get a string representation of a signal for debugging. Args: - sig: A pyqtSignal. + sig: A bound signal. args: The arguments as list of strings. Return: diff --git a/qutebrowser/utils/message.py b/qutebrowser/utils/message.py index 2754d87e7..c257ec88d 100644 --- a/qutebrowser/utils/message.py +++ b/qutebrowser/utils/message.py @@ -25,7 +25,7 @@ import traceback import typing -from PyQt5.QtCore import pyqtSignal, QObject +from PyQt5.QtCore import pyqtSignal, pyqtBoundSignal, QObject from qutebrowser.utils import usertypes, log, utils @@ -87,7 +87,7 @@ def _build_question(title: str, text: str = None, *, mode: usertypes.PromptMode, default: typing.Union[None, bool, str] = None, - abort_on: typing.Iterable[pyqtSignal] = (), + abort_on: typing.Iterable[pyqtBoundSignal] = (), url: str = None, option: bool = None) -> usertypes.Question: """Common function for ask/ask_async.""" |