Improve on_any_event and add type annotations

sebastinas · sebastinas · commit 592725a487a9 · 2022-05-05T09:35:32.000+02:00
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -104,7 +104,7 @@ def _request_refresh(self) -> None:
     def _schedule_refresh(self, when: float) -> None:
         return self._schedule_refresh_callback(when)
 
-    def _request_reload(self, files_modified: Sequence[str] = ("?",)) -> None:
+    def _request_reload(self, files_modified: Sequence[str]) -> None:
         return self._request_reload_callback(files_modified)
 
     def interrupting_refresh(self) -> None:
diff --git a/bpython/curtsiesfrontend/filewatch.py b/bpython/curtsiesfrontend/filewatch.py
@@ -1,6 +1,6 @@
 import os
 from collections import defaultdict
-from typing import Dict, Iterable, Set, List
+from typing import Callable, Dict, Iterable, Sequence, Set, List
 
 from .. import importcompletion
 
@@ -15,7 +15,11 @@ def ModuleChangedEventHandler(*args):
 else:
 
     class ModuleChangedEventHandler(FileSystemEventHandler):  # type: ignore [no-redef]
-        def __init__(self, paths: Iterable[str], on_change) -> None:
+        def __init__(
+            self,
+            paths: Iterable[str],
+            on_change: Callable[[Sequence[str]], None],
+        ) -> None:
             self.dirs: Dict[str, Set[str]] = defaultdict(set)
             self.on_change = on_change
             self.modules_to_add_later: List[str] = []
@@ -77,6 +81,7 @@ def deactivate(self) -> None:
 
         def on_any_event(self, event: FileSystemEvent) -> None:
             dirpath = os.path.dirname(event.src_path)
-            paths = [path + ".py" for path in self.dirs[dirpath]]
-            if event.src_path in paths:
-                self.on_change(files_modified=[event.src_path])
+            if any(
+                event.src_path == f"{path}.py" for path in self.dirs[dirpath]
+            ):
+                self.on_change((event.src_path,))
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -17,6 +17,7 @@
     Any,
     List,
     Optional,
+    Sequence,
     Tuple,
     Union,
     Type,
@@ -516,7 +517,7 @@ def _request_refresh(self):
         RefreshRequestEvent."""
         raise NotImplementedError
 
-    def _request_reload(self, files_modified=("?",)):
+    def _request_reload(self, files_modified: Sequence[str]) -> None:
         """Like request_refresh, but for reload requests events."""
         raise NotImplementedError
 
@@ -546,10 +547,10 @@ def request_refresh(self):
         else:
             self._request_refresh()
 
-    def request_reload(self, files_modified=()):
+    def request_reload(self, files_modified: Sequence[str] = ()) -> None:
         """Request that a ReloadEvent be passed next into process_event"""
         if self.watching_files:
-            self._request_reload(files_modified=files_modified)
+            self._request_reload(files_modified)
 
     def schedule_refresh(self, when: float = 0) -> None:
         """Schedule a ScheduledRefreshRequestEvent for when.
