Add type annotations

sebastinas · sebastinas · commit 9ffa5f3eef56 · 2022-05-05T01:13:50.000+02:00
diff --git a/bpython/curtsiesfrontend/filewatch.py b/bpython/curtsiesfrontend/filewatch.py
@@ -1,11 +1,12 @@
 import os
 from collections import defaultdict
+from typing import Dict, Iterable, Set, List
 
 from .. import importcompletion
 
 try:
     from watchdog.observers import Observer
-    from watchdog.events import FileSystemEventHandler
+    from watchdog.events import FileSystemEventHandler, FileSystemEvent
 except ImportError:
 
     def ModuleChangedEventHandler(*args):
@@ -14,26 +15,26 @@ def ModuleChangedEventHandler(*args):
 else:
 
     class ModuleChangedEventHandler(FileSystemEventHandler):  # type: ignore [no-redef]
-        def __init__(self, paths, on_change):
-            self.dirs = defaultdict(set)
+        def __init__(self, paths: Iterable[str], on_change) -> None:
+            self.dirs: Dict[str, Set[str]] = defaultdict(set)
             self.on_change = on_change
-            self.modules_to_add_later = []
+            self.modules_to_add_later: List[str] = []
             self.observer = Observer()
-            self.old_dirs = defaultdict(set)
+            self.old_dirs: Dict[str, Set[str]] = defaultdict(set)
             self.started = False
             self.activated = False
             for path in paths:
                 self._add_module(path)
 
             super().__init__()
 
-        def reset(self):
+        def reset(self) -> None:
             self.dirs = defaultdict(set)
             del self.modules_to_add_later[:]
             self.old_dirs = defaultdict(set)
             self.observer.unschedule_all()
 
-        def _add_module(self, path):
+        def _add_module(self, path: str) -> None:
             """Add a python module to track changes"""
             path = os.path.abspath(path)
             for suff in importcompletion.SUFFIXES:
@@ -45,10 +46,10 @@ def _add_module(self, path):
                 self.observer.schedule(self, dirname, recursive=False)
             self.dirs[dirname].add(path)
 
-        def _add_module_later(self, path):
+        def _add_module_later(self, path: str) -> None:
             self.modules_to_add_later.append(path)
 
-        def track_module(self, path):
+        def track_module(self, path: str) -> None:
             """
             Begins tracking this if activated, or remembers to track later.
             """
@@ -57,7 +58,7 @@ def track_module(self, path):
             else:
                 self._add_module_later(path)
 
-        def activate(self):
+        def activate(self) -> None:
             if self.activated:
                 raise ValueError(f"{self!r} is already activated.")
             if not self.started:
@@ -70,13 +71,13 @@ def activate(self):
             del self.modules_to_add_later[:]
             self.activated = True
 
-        def deactivate(self):
+        def deactivate(self) -> None:
             if not self.activated:
                 raise ValueError(f"{self!r} is not activated.")
             self.observer.unschedule_all()
             self.activated = False
 
-        def on_any_event(self, event):
+        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:
diff --git a/stubs/watchdog/events.pyi b/stubs/watchdog/events.pyi
@@ -1 +1,5 @@
+class FileSystemEvent:
+    @property
+    def src_path(self) -> str: ...
+
 class FileSystemEventHandler: ...
diff --git a/stubs/watchdog/observers.pyi b/stubs/watchdog/observers.pyi
@@ -1,4 +1,8 @@
+from .events import FileSystemEventHandler
+
 class Observer:
     def start(self): ...
-    def schedule(self, dirname: str, recursive: bool): ...
+    def schedule(
+        self, observer: FileSystemEventHandler, dirname: str, recursive: bool
+    ): ...
     def unschedule_all(self): ...
