re: #275 removed superfluous todos

Author: JoachimCoenen

src/watchdog/observers/inotify.py

@@ -200,7 +200,7 @@ def on_event(self, event: InotifyEvent) -> None:
                 return
             src_path = self._build_event_source_path(event)
 
-            # todo look into desired behavior for IN_MOVE_SELF events (keep watching?, stop watching?)
+            # todo look into desired behavior for IN_MOVE_SELF events (keep watching?, stop watching?, are they even possible?)
             if event.is_moved_from:
                 # TODO: When a directory from a watched directory
                 #  is moved into another part of the filesystem, this
@@ -244,14 +244,12 @@ def _recursive_simulate(self, src_path: bytes) -> list[InotifyEvent]:
             for dirname in dirnames:
                 full_path = os.path.join(root, dirname)
                 wd_dir = self._active_callbacks_by_path[os.path.dirname(full_path)]
-                # todo handle missing callback because a subfolder has been created between self._add_all_callbacks(src_path) and this line of code.
                 mask = Mask(InotifyConstants.IN_CREATE | InotifyConstants.IN_ISDIR)
                 events.append(InotifyEvent(wd_dir, mask, 0, dirname))
 
             for filename in filenames:
                 full_path = os.path.join(root, filename)
                 wd_parent_dir = self._active_callbacks_by_path[os.path.dirname(full_path)]
-                # todo handle missing callback because a subfolder has been created between self._add_all_callbacks(src_path) and this line of code.
                 mask = InotifyConstants.IN_CREATE
                 events.append(InotifyEvent(wd_parent_dir, mask, 0, filename))
         return events
@@ -278,7 +276,8 @@ def _activate(self) -> None:
 
     def _build_event_source_path(self, event: InotifyEvent) -> bytes | None:
         watched_path = self._active_callbacks_by_watch.get(event.wd)
-        if watched_path is None:  # todo investigate: can we *actually* get events for WatchDescriptor that have already been removed?
+        if watched_path is None:
+            # investigate: can we *actually* get events for a WatchDescriptor that has already been removed?
             return None
         return os.path.join(watched_path, event.name) if event.name else watched_path  # avoid trailing slash
 

src/watchdog/observers/inotify_c.py

@@ -28,17 +28,6 @@
     raise UnsupportedLibcError(error)
 
 
-# ##############################################################################
-# TODOs:
-# - todo use enum.Flag for events & mask.
-# - todo handle watches that do not follow move events
-# - todo fire DirModifiedEvents (?)
-# - todo investigate: inotify does not generate move events for self? (e.g. watch on file F and F gets moved)
-#     observation 1: watch follows the file, but no move event is generated.
-# - todo
-# ##############################################################################
-
-
 WatchDescriptor = NewType("WatchDescriptor", int)
 Mask = NewType("Mask", int)
 
@@ -104,7 +93,7 @@ class InotifyConstants:
     IN_NONBLOCK: ClassVar[Mask] = 0x00004000
 
 
-INOTIFY_ALL_CONSTANTS: dict[str, Mask] = {  # todo remove once mask uses enum.Flags.
+INOTIFY_ALL_CONSTANTS: dict[str, Mask] = {
     name: getattr(InotifyConstants, name)
     for name in dir(InotifyConstants)
     if name.startswith("IN_") and name not in {"IN_ALL_EVENTS", "IN_MOVE"}
@@ -130,7 +119,7 @@ class InotifyConstants:
 )
 
 
-def _get_mask_string(mask: int) -> str:  # todo remove once mask uses enum.Flags.
+def _get_mask_string(mask: int) -> str:
     return "|".join(
         name for name, c_val in INOTIFY_ALL_CONSTANTS.items() if mask & c_val
     )