Fix lint

4 files changed, 13 insertions, 7 deletions

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 4b9a27104..330bb2b37 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -46,7 +46,7 @@ Changed
   resource loads on TLS errors. This behavior is consistent with what other
   browsers do.
 - The prompt text shown on certificate errors has been improved to make it
-  clearer what kind of error occured exactly.
+  clearer what kind of error occurred exactly.
 - The completion now also shows bindings starting with `set-cmd-text` in its
   third column, such as `o` for `:open`.
 
diff --git a/qutebrowser/browser/shared.py b/qutebrowser/browser/shared.py
index c1a169ac2..41e7734f8 100644
--- a/qutebrowser/browser/shared.py
+++ b/qutebrowser/browser/shared.py
@@ -182,7 +182,9 @@ def ignore_certificate_error(
     # scheme might not match.
     is_resource = (
         first_party_url.isValid() and
-        not request_url.matches(first_party_url, QUrl.RemoveScheme))
+        not request_url.matches(
+            first_party_url,
+            QUrl.RemoveScheme))  # type: ignore[arg-type]
 
     if conf == 'ask' or conf == 'ask-block-thirdparty' and not is_resource:
         err_template = jinja.environment.from_string("""
@@ -212,7 +214,8 @@ def ignore_certificate_error(
             error=error,
         )
 
-        urlstr = request_url.toString(QUrl.RemovePassword | QUrl.FullyEncoded)
+        urlstr = request_url.toString(
+            QUrl.RemovePassword | QUrl.FullyEncoded)  # type: ignore[arg-type]
         ignore = message.ask(title="Certificate error", text=msg,
                              mode=usertypes.PromptMode.yesno, default=False,
                              abort_on=abort_on, url=urlstr)
diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py
index 130e151bd..c97c91d66 100644
--- a/qutebrowser/browser/webkit/network/networkmanager.py
+++ b/qutebrowser/browser/webkit/network/networkmanager.py
@@ -26,7 +26,7 @@ from typing import TYPE_CHECKING, Dict, MutableMapping, Optional, Set
 
 from PyQt5.QtCore import pyqtSlot, pyqtSignal, QUrl, QByteArray
 from PyQt5.QtNetwork import (QNetworkAccessManager, QNetworkReply, QSslSocket,
-                             QSslError, QNetworkProxy)
+                             QNetworkProxy)
 
 from qutebrowser.config import config
 from qutebrowser.utils import (message, log, usertypes, utils, objreg,
@@ -122,7 +122,10 @@ def init():
         QSslSocket.setDefaultCiphers(good_ciphers)
 
 
-_SavedErrorsType = MutableMapping[urlutils.HostTupleType, Set[QSslError]]
+_SavedErrorsType = MutableMapping[
+    urlutils.HostTupleType,
+    Set[certificateerror.CertificateErrorWrapper],
+]
 
 
 class NetworkManager(QNetworkAccessManager):
@@ -224,7 +227,7 @@ class NetworkManager(QNetworkAccessManager):
         # - There's a generic NetworkManager, e.g. for downloads
         # - The download was in a tab which is now closed.
         if self._tab_id is None:
-            return
+            return None
 
         assert self._win_id is not None
         try:
diff --git a/qutebrowser/utils/usertypes.py b/qutebrowser/utils/usertypes.py
index 4408ce6cb..ee0f899cc 100644
--- a/qutebrowser/utils/usertypes.py
+++ b/qutebrowser/utils/usertypes.py
@@ -23,7 +23,7 @@ import html
 import operator
 import enum
 import dataclasses
-from typing import Any, Optional, Sequence, TypeVar, Union
+from typing import Optional, Sequence, TypeVar, Union
 
 from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QTimer
 from PyQt5.QtCore import QUrl