mypy: Fix new mypy issues

This commit is contained in:
Florian Bruhin 2025-02-17 10:08:31 +01:00
parent f7c8c67818
commit 0b221d3e24
2 changed files with 10 additions and 11 deletions

View File

@ -9,6 +9,7 @@ import os.path
import sys
import bdb
import pdb # noqa: T002
import types
import signal
import argparse
import functools
@ -16,7 +17,7 @@ import threading
import faulthandler
import dataclasses
from typing import TYPE_CHECKING, Optional, cast
from collections.abc import MutableMapping
from collections.abc import Callable, MutableMapping
from qutebrowser.qt.core import (pyqtSlot, qInstallMessageHandler, QObject,
QSocketNotifier, QTimer, QUrl)
@ -324,7 +325,9 @@ class SignalHandler(QObject):
self._activated = False
self._orig_wakeup_fd: Optional[int] = None
self._handlers = {
self._handlers: dict[
signal.Signals, Callable[[int, Optional[types.FrameType]], None]
] = {
signal.SIGINT: self.interrupt,
signal.SIGTERM: self.interrupt,
}
@ -332,8 +335,10 @@ class SignalHandler(QObject):
"SIGHUP": self.reload_config,
}
for sig_str, handler in platform_dependant_handlers.items():
if hasattr(signal.Signals, sig_str):
try:
self._handlers[signal.Signals[sig_str]] = handler
except KeyError:
pass
def activate(self):
"""Set up signal handlers.

View File

@ -11,18 +11,12 @@ import ipaddress
import posixpath
import urllib.parse
import mimetypes
from typing import Optional, Union, cast, TYPE_CHECKING
from typing import Optional, Union, cast
from collections.abc import Iterable
from qutebrowser.qt import machinery
from qutebrowser.qt.core import QUrl, QUrlQuery
from qutebrowser.qt.network import QHostInfo, QHostAddress, QNetworkProxy
# WORKAROUND for
# https://www.riverbankcomputing.com/pipermail/pyqt/2024-December/046096.html
if TYPE_CHECKING and machinery.IS_QT6:
from qutebrowser.qt.core import QChar
else:
QChar = str
from qutebrowser.api import cmdutils
from qutebrowser.config import config
@ -704,7 +698,7 @@ def get_url_yank_text(url: QUrl, *, pretty: bool) -> str:
url_query = QUrlQuery()
url_query_str = url.query()
if '&' not in url_query_str and ';' in url_query_str:
url_query.setQueryDelimiters(cast(QChar, '='), cast(QChar, ';'))
url_query.setQueryDelimiters('=', ';')
url_query.setQuery(url_query_str)
for key in dict(url_query.queryItems()):
if key in config.val.url.yank_ignored_parameters: