Fix FSEventObserver (add follow_symlink kwarg)

* Improve link test in inotify_c.py

src/watchdog/observers/api.py

@@ -37,8 +37,14 @@ class ObservedWatch:
         Optional collection of :class:`watchdog.events.FileSystemEvent` to watch
     """
 
-    def __init__(self, path: str | Path, *, recursive: bool, event_filter: list[type[FileSystemEvent]] | None = None,
-                 follow_symlink: bool = False):
+    def __init__(
+        self,
+        path: str | Path,
+        *,
+        recursive: bool,
+        event_filter: list[type[FileSystemEvent]] | None = None,
+        follow_symlink: bool = False,
+    ):
         self._path = str(path) if isinstance(path, Path) else path
         self._is_recursive = recursive
         self._follow_symlink = follow_symlink
@@ -281,7 +287,7 @@ def schedule(
         *,
         recursive: bool = False,
         event_filter: list[type[FileSystemEvent]] | None = None,
-        follow_symlink: bool = False
+        follow_symlink: bool = False,
     ) -> ObservedWatch:
         """Schedules watching a path and calls appropriate methods specified
         in the given event handler in response to file system events.

src/watchdog/observers/fsevents.py

@@ -329,11 +329,13 @@ def schedule(
         path: str,
         *,
         recursive: bool = False,
+        follow_symlink: bool = False,
         event_filter: list[type[FileSystemEvent]] | None = None,
     ) -> ObservedWatch:
         # Fix for issue #26: Trace/BPT error when given a unicode path
         # string. https://github.com/gorakhargosh/watchdog/issues#issue/26
         if isinstance(path, str):
             path = unicodedata.normalize("NFC", path)
 
-        return super().schedule(event_handler, path, recursive=recursive, event_filter=event_filter)
+        return super().schedule(event_handler, path, recursive=recursive, follow_symlink=follow_symlink,
+                                event_filter=event_filter)

src/watchdog/observers/inotify.py

@@ -116,8 +116,9 @@ def __init__(
     def on_thread_start(self) -> None:
         path = os.fsencode(self.watch.path)
         event_mask = self.get_event_mask_from_filter()
-        self._inotify = InotifyBuffer(path, recursive=self.watch.is_recursive, event_mask=event_mask,
-                                      follow_symlink=self.watch.follow_symlink)
+        self._inotify = InotifyBuffer(
+            path, recursive=self.watch.is_recursive, event_mask=event_mask, follow_symlink=self.watch.follow_symlink
+        )
 
     def on_thread_stop(self) -> None:
         if self._inotify:

src/watchdog/observers/inotify_buffer.py

@@ -23,8 +23,9 @@ class InotifyBuffer(BaseThread):
 
     delay = 0.5
 
-    def __init__(self, path: bytes, *, recursive: bool = False, event_mask: int | None = None,
-                 follow_symlink: bool = False) -> None:
+    def __init__(
+        self, path: bytes, *, recursive: bool = False, event_mask: int | None = None, follow_symlink: bool = False
+    ) -> None:
         super().__init__()
         # XXX: Remove quotes after Python 3.9 drop
         self._queue = DelayedQueue["InotifyEvent | tuple[InotifyEvent, InotifyEvent]"](self.delay)

src/watchdog/observers/inotify_c.py

@@ -142,8 +142,9 @@ class Inotify:
         ``True`` if subdirectories should be monitored; ``False`` otherwise.
     """
 
-    def __init__(self, path: bytes, *, recursive: bool = False, event_mask: int | None = None,
-                 follow_symlink: bool = False) -> None:
+    def __init__(
+        self, path: bytes, *, recursive: bool = False, event_mask: int | None = None, follow_symlink: bool = False
+    ) -> None:
         # The file descriptor associated with the inotify instance.
         inotify_fd = inotify_init()
         if inotify_fd == -1:
@@ -410,7 +411,7 @@ def _add_dir_watch(self, path: bytes, mask: int, *, recursive: bool) -> None:
             for root, dirnames, _ in os.walk(path):
                 for dirname in dirnames:
                     full_path = os.path.join(root, dirname)
-                    if os.path.islink(full_path) and not self._follow_symlink:
+                    if not self._follow_symlink and os.path.islink(full_path):
                         continue
                     self._add_watch(full_path, mask)