Fix mypy issues

2 files changed, 20 insertions, 6 deletions

diff --git a/qutebrowser/extensions/loader.py b/qutebrowser/extensions/loader.py
index bc4494bae..be7beeb11 100644
--- a/qutebrowser/extensions/loader.py
+++ b/qutebrowser/extensions/loader.py
@@ -34,6 +34,11 @@ from qutebrowser import components
 from qutebrowser.config import config
 from qutebrowser.utils import log, standarddir, objreg
 
+MYPY = False
+if MYPY:
+    # pylint: disable=unused-import,useless-suppression
+    import argparse
+
 
 # ModuleInfo objects for all loaded plugins
 _module_infos = []
@@ -57,7 +62,8 @@ class ModuleInfo:
     This gets used by qutebrowser.api.hook.
     """
 
-    _ConfigChangedHooksType = typing.List[typing.Tuple[str, typing.Callable]]
+    _ConfigChangedHooksType = typing.List[typing.Tuple[typing.Optional[str],
+                                                       typing.Callable]]
 
     init_hook = attr.ib(None)  # type: typing.Optional[typing.Callable]
     config_changed_hooks = attr.ib(
@@ -156,10 +162,13 @@ def _on_config_changed(changed_name: str) -> None:
     """Call config_changed hooks if the config changed."""
     for mod_info in _module_infos:
         for option, hook in mod_info.config_changed_hooks:
-            cfilter = config.change_filter(option)
-            cfilter.validate()
-            if cfilter.check_match(changed_name):
+            if option is None:
                 hook()
+            else:
+                cfilter = config.change_filter(option)
+                cfilter.validate()
+                if cfilter.check_match(changed_name):
+                    hook()
 
 
 def init() -> None:
diff --git a/qutebrowser/extensions/requests.py b/qutebrowser/extensions/requests.py
index 8364dc76d..952c830dc 100644
--- a/qutebrowser/extensions/requests.py
+++ b/qutebrowser/extensions/requests.py
@@ -23,6 +23,11 @@ import typing
 
 import attr
 
+MYPY = False
+if MYPY:
+    # pylint: disable=unused-import,useless-suppression
+    from PyQt5.QtCore import QUrl
+
 
 @attr.s
 class Request:
@@ -33,7 +38,7 @@ class Request:
     request_url = attr.ib()  # type: QUrl
     is_blocked = attr.ib(False)  # type: bool
 
-    def block(self):
+    def block(self) -> None:
         """Block this request."""
         self.is_blocked = True
 
@@ -48,6 +53,6 @@ def register_filter(reqfilter: RequestFilterType) -> None:
     _request_filters.append(reqfilter)
 
 
-def run_filters(info):
+def run_filters(info: Request) -> None:
     for reqfilter in _request_filters:
         reqfilter(info)