fix: handling of None messages from notify callback

This is especially common as BaseMessageBus._finalize calls handler(None, err) when an exception is raised.
Bluetooth-Devices · Sep 4, 2023 · 3b4813a · 3b4813a
1 parent 119b27b
commit 3b4813a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/dbus_fast/message_bus.py b/src/dbus_fast/message_bus.py
@@ -1194,7 +1194,7 @@ def add_match_notify(msg, err):
                 logging.error(
                     f'add match request failed. match="{self._name_owner_match_rule}", {err}'
                 )
-            if msg.message_type == MessageType.ERROR:
+            elif msg.message_type == MessageType.ERROR:
                 logging.error(
                     f'add match request failed. match="{self._name_owner_match_rule}", {msg.body[0]}'
                 )
@@ -1228,7 +1228,7 @@ def _add_match_rule(self, match_rule):
         def add_match_notify(msg: Message, err: Optional[Exception]) -> None:
             if err:
                 logging.error(f'add match request failed. match="{match_rule}", {err}')
-            if msg.message_type == MessageType.ERROR:
+            elif msg.message_type == MessageType.ERROR:
                 logging.error(
                     f'add match request failed. match="{match_rule}", {msg.body[0]}'
                 )
@@ -1267,7 +1267,7 @@ def remove_match_notify(msg, err):
                 logging.error(
                     f'remove match request failed. match="{match_rule}", {err}'
                 )
-            if msg.message_type == MessageType.ERROR:
+            elif msg.message_type == MessageType.ERROR:
                 logging.error(
                     f'remove match request failed. match="{match_rule}", {msg.body[0]}'
                 )