From 11b65b1eb313c0d816bfdc99d36b7c9d3d347cd8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@users.noreply.github.com>
Date: Fri, 13 Dec 2024 09:21:14 +0100
Subject: [PATCH] Bump watchdog to 6.0.0 (#132895)

---
 .../components/folder_watcher/__init__.py          | 14 +++++++++-----
 .../components/folder_watcher/manifest.json        |  2 +-
 requirements_all.txt                               |  2 +-
 requirements_test_all.txt                          |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/homeassistant/components/folder_watcher/__init__.py b/homeassistant/components/folder_watcher/__init__.py
index 3aeaa6f7ef2..dd56b3aad72 100644
--- a/homeassistant/components/folder_watcher/__init__.py
+++ b/homeassistant/components/folder_watcher/__init__.py
@@ -7,6 +7,10 @@ import os
 from typing import cast
 
 from watchdog.events import (
+    DirCreatedEvent,
+    DirDeletedEvent,
+    DirModifiedEvent,
+    DirMovedEvent,
     FileClosedEvent,
     FileCreatedEvent,
     FileDeletedEvent,
@@ -68,7 +72,7 @@ class EventHandler(PatternMatchingEventHandler):
 
     def __init__(self, patterns: list[str], hass: HomeAssistant, entry_id: str) -> None:
         """Initialise the EventHandler."""
-        super().__init__(patterns)
+        super().__init__(patterns=patterns)
         self.hass = hass
         self.entry_id = entry_id
 
@@ -101,19 +105,19 @@ class EventHandler(PatternMatchingEventHandler):
             signal = f"folder_watcher-{self.entry_id}"
             dispatcher_send(self.hass, signal, event.event_type, fireable)
 
-    def on_modified(self, event: FileModifiedEvent) -> None:
+    def on_modified(self, event: DirModifiedEvent | FileModifiedEvent) -> None:
         """File modified."""
         self.process(event)
 
-    def on_moved(self, event: FileMovedEvent) -> None:
+    def on_moved(self, event: DirMovedEvent | FileMovedEvent) -> None:
         """File moved."""
         self.process(event, moved=True)
 
-    def on_created(self, event: FileCreatedEvent) -> None:
+    def on_created(self, event: DirCreatedEvent | FileCreatedEvent) -> None:
         """File created."""
         self.process(event)
 
-    def on_deleted(self, event: FileDeletedEvent) -> None:
+    def on_deleted(self, event: DirDeletedEvent | FileDeletedEvent) -> None:
         """File deleted."""
         self.process(event)
 
diff --git a/homeassistant/components/folder_watcher/manifest.json b/homeassistant/components/folder_watcher/manifest.json
index 7b471e08fcc..1f0d9c595ee 100644
--- a/homeassistant/components/folder_watcher/manifest.json
+++ b/homeassistant/components/folder_watcher/manifest.json
@@ -7,5 +7,5 @@
   "iot_class": "local_polling",
   "loggers": ["watchdog"],
   "quality_scale": "internal",
-  "requirements": ["watchdog==2.3.1"]
+  "requirements": ["watchdog==6.0.0"]
 }
diff --git a/requirements_all.txt b/requirements_all.txt
index 9c1285b6d32..e4fcb06671b 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -2980,7 +2980,7 @@ wakeonlan==2.1.0
 wallbox==0.7.0
 
 # homeassistant.components.folder_watcher
-watchdog==2.3.1
+watchdog==6.0.0
 
 # homeassistant.components.waterfurnace
 waterfurnace==1.1.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 56c8be03f43..257125c450d 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -2387,7 +2387,7 @@ wakeonlan==2.1.0
 wallbox==0.7.0
 
 # homeassistant.components.folder_watcher
-watchdog==2.3.1
+watchdog==6.0.0
 
 # homeassistant.components.watergate
 watergate-local-api==2024.4.1