From 1b3fc4afb7e118ebccd4e5702ad35947881f0b89 Mon Sep 17 00:00:00 2001
From: John Lancaster <32917998+jsl12@users.noreply.github.com>
Date: Tue, 27 Aug 2024 00:41:25 -0500
Subject: [PATCH] changes for use_dictionary_unpacking

---
 src/room_control/button.py       |  2 +-
 src/room_control/motion.py       |  4 ++--
 src/room_control/room_control.py | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/room_control/button.py b/src/room_control/button.py
index dfa44de..9f60eee 100644
--- a/src/room_control/button.py
+++ b/src/room_control/button.py
@@ -25,7 +25,7 @@ class Button:
         )
         self.logger.info(f'MQTT topic [topic]{topic}[/] controls [room]{self.adapi.name}[/]')
 
-    def handle_button(self, event_name: str, data: Dict[str, Any], kwargs: Dict[str, Any]):
+    def handle_button(self, event_name: str, data: Dict[str, Any], **kwargs: Dict[str, Any]):
         try:
             payload = json.loads(data['payload'])
             action = payload['action']
diff --git a/src/room_control/motion.py b/src/room_control/motion.py
index f6e5769..d186532 100644
--- a/src/room_control/motion.py
+++ b/src/room_control/motion.py
@@ -64,14 +64,14 @@ class MotionSensor:
     def state_mismatch(self) -> bool:
         return self.sensor_state != self.ref_state
 
-    def callback_light_on(self, entity: str, attribute: str, old: str, new: str, kwargs: dict):
+    def callback_light_on(self, entity: str, attribute: str, old: str, new: str, **kwargs: dict):
         """Called when the light turns on"""
         if new['state'] == 'on':
             self.logger.debug(f'Detected {entity} turning on')
             duration = self.adapi.off_duration()
             self.listen_motion_off(duration)
 
-    def callback_light_off(self, entity: str, attribute: str, old: str, new: str, kwargs: dict):
+    def callback_light_off(self, entity: str, attribute: str, old: str, new: str, **kwargs: dict):
         """Called when the light turns off"""
         self.logger.debug(f'Detected {entity} turning off')
         self.listen_motion_on()
diff --git a/src/room_control/room_control.py b/src/room_control/room_control.py
index 4aa4b81..4ab9320 100755
--- a/src/room_control/room_control.py
+++ b/src/room_control/room_control.py
@@ -195,7 +195,7 @@ class RoomController(Hass):
     def activate(self, **kwargs):
         self.call_service(f'{self.name}/activate', namespace='controller', **kwargs)
 
-    def _service_activate(self, namespace: str, domain: str, service: str, kwargs: Dict[str, Any]):
+    def _service_activate(self, namespace: str, domain: str, service: str, **kwargs: Dict[str, Any]):
         # self.log(f'Custom kwargs: {kwargs}', level='DEBUG')
         state = self.current_state()
         if isinstance(state.scene, str):
@@ -211,7 +211,7 @@ class RoomController(Hass):
         self.call_service(f'{self.name}/activate_any_on', namespace='controller', **kwargs)
 
     def _service_activate_any_on(
-        self, namespace: str, domain: str, service: str, kwargs: Dict[str, Any]
+        self, namespace: str, domain: str, service: str, **kwargs: Dict[str, Any]
     ):
         if self.any_on() and not self.manual_mode():
             self.activate(**kwargs)
@@ -221,7 +221,7 @@ class RoomController(Hass):
         self.call_service(f'{self.name}/activate_all_off', namespace='controller', **kwargs)
 
     def _service_activate_all_off(
-        self, namespace: str, domain: str, service: str, kwargs: Dict[str, Any]
+        self, namespace: str, domain: str, service: str, **kwargs: Dict[str, Any]
     ):
         if self.all_off() and not self.manual_mode():
             self.activate(**kwargs)
@@ -230,7 +230,7 @@ class RoomController(Hass):
         self.call_service(f'{self.name}/deactivate', namespace='controller', **kwargs)
 
     def _service_deactivate(
-        self, namespace: str, domain: str, service: str, kwargs: Dict[str, Any]
+        self, namespace: str, domain: str, service: str, **kwargs: Dict[str, Any]
     ):
         for e in self.app_entities:
             self.turn_off(e)
@@ -238,7 +238,7 @@ class RoomController(Hass):
     def toggle(self, **kwargs):
         self.call_service(f'{self.name}/toggle', namespace='controller', **kwargs)
 
-    def _service_toggle(self, namespace: str, domain: str, service: str, kwargs: Dict[str, Any]):
+    def _service_toggle(self, namespace: str, domain: str, service: str, **kwargs: Dict[str, Any]):
         if self.any_on():
             self.deactivate(**kwargs)
         else: