invoke_callback_if_exists -> invoke_callback

pi-top · Dec 6, 2022 · 53e38c8 · 53e38c8
1 parent d7eb29c
commit 53e38c8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/packages/common/pitop/common/ptdm.py b/packages/common/pitop/common/ptdm.py
@@ -465,9 +465,9 @@ def __thread_method(self):
 
                 callback = self._callback_funcs.get(message.message_id())
                 if callback:
-                    self.invoke_callback_func_if_exists(callback, message.parameters)
+                    self.invoke_callback(callback, message.parameters)
 
-    def invoke_callback_func_if_exists(self, callback, params=None):
+    def invoke_callback(self, callback, params=None):
         if params is None:
             params = list()
 

diff --git a/packages/display/pitop/display/display.py b/packages/display/pitop/display/display.py
@@ -18,29 +18,21 @@ def __init__(self):
 
     def __setup_subscribe_client(self):
         def on_brightness_changed(parameters):
-            self.__ptdm_subscribe_client.invoke_callback_func_if_exists(
+            self.__ptdm_subscribe_client.invoke_callback(
                 self.when_brightness_changed, parameters[0]
             )
 
         def on_screen_blanked():
-            self.__ptdm_subscribe_client.invoke_callback_func_if_exists(
-                self.when_screen_blanked
-            )
+            self.__ptdm_subscribe_client.invoke_callback(self.when_screen_blanked)
 
         def on_screen_unblanked():
-            self.__ptdm_subscribe_client.invoke_callback_func_if_exists(
-                self.when_screen_unblanked
-            )
+            self.__ptdm_subscribe_client.invoke_callback(self.when_screen_unblanked)
 
         def on_lid_closed():
-            self.__ptdm_subscribe_client.invoke_callback_func_if_exists(
-                self.when_lid_closed
-            )
+            self.__ptdm_subscribe_client.invoke_callback(self.when_lid_closed)
 
         def on_lid_opened():
-            self.__ptdm_subscribe_client.invoke_callback_func_if_exists(
-                self.when_lid_opened
-            )
+            self.__ptdm_subscribe_client.invoke_callback(self.when_lid_opened)
 
         self.__ptdm_subscribe_client = PTDMSubscribeClient()
         self.__ptdm_subscribe_client.initialise(