summaryrefslogtreecommitdiff
path: root/qutebrowser/utils
diff options
context:
space:
mode:
Diffstat (limited to 'qutebrowser/utils')
-rw-r--r--qutebrowser/utils/debug.py4
-rw-r--r--qutebrowser/utils/log.py7
-rw-r--r--qutebrowser/utils/version.py3
3 files changed, 9 insertions, 5 deletions
diff --git a/qutebrowser/utils/debug.py b/qutebrowser/utils/debug.py
index 7d069909a..0fa74f4e7 100644
--- a/qutebrowser/utils/debug.py
+++ b/qutebrowser/utils/debug.py
@@ -81,7 +81,7 @@ def log_signals(obj: QObject) -> QObject:
pass
if inspect.isclass(obj):
- old_init = obj.__init__ # type: ignore[misc]
+ old_init = obj.__init__
@functools.wraps(old_init)
def new_init(self: Any, *args: Any, **kwargs: Any) -> None:
@@ -89,7 +89,7 @@ def log_signals(obj: QObject) -> QObject:
old_init(self, *args, **kwargs)
connect_log_slot(self)
- obj.__init__ = new_init # type: ignore[misc]
+ obj.__init__ = new_init
else:
connect_log_slot(obj)
diff --git a/qutebrowser/utils/log.py b/qutebrowser/utils/log.py
index 54ca4029b..6677e383e 100644
--- a/qutebrowser/utils/log.py
+++ b/qutebrowser/utils/log.py
@@ -43,7 +43,9 @@ except ImportError:
colorama = None
if TYPE_CHECKING:
+ # pylint: disable=unused-import
from qutebrowser.config import config as configmodule
+ from typing import TextIO
_log_inited = False
_args = None
@@ -257,7 +259,7 @@ def _init_handlers(
force_color: bool,
json_logging: bool,
ram_capacity: int
-) -> Tuple[logging.StreamHandler, Optional['RAMHandler']]:
+) -> Tuple["logging.StreamHandler[TextIO]", Optional['RAMHandler']]:
"""Init log handlers.
Args:
@@ -727,7 +729,8 @@ class ColoredFormatter(logging.Formatter):
datefmt: str,
style: str, *,
use_colors: bool) -> None:
- super().__init__(fmt, datefmt, style)
+ super().__init__(fmt, datefmt, style) # type: ignore[arg-type]
+ # FIXME Use Literal["%", "{", "$"] once we use Python 3.8 or typing_extensions
self.use_colors = use_colors
def format(self, record: logging.LogRecord) -> str:
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index 3beb6fb83..8da86dd00 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -514,7 +514,8 @@ def _get_pyqt_webengine_qt_version() -> Optional[str]:
import importlib_metadata
except ImportError:
try:
- import importlib.metadata as importlib_metadata # type: ignore[no-redef]
+ # pylint: disable=line-too-long
+ import importlib.metadata as importlib_metadata # type: ignore[import, no-redef]
except ImportError:
log.misc.debug("Neither importlib.metadata nor backport available")
return None