Fix depreciation-warning

Author: bouwew

plugwise/common.py

@@ -5,7 +5,7 @@
 from __future__ import annotations
 
 from plugwise.constants import ModelData
-from plugwise.util import check_heater_central, check_model, get_vendor_name
+from plugwise.util import check_heater_central, check_model, get_vendor_name, safe
 
 from defusedxml import ElementTree as etree
 from munch import Munch
@@ -32,7 +32,7 @@ def _appl_thermostat_info(self, appl: Munch, xml_1: etree, xml_2: etree = None)
         """Helper-function for _appliance_info_finder()."""
         locator = "./logs/point_log[type='thermostat']/thermostat"
         mod_type = "thermostat"
-        xml_2 = xml_2 or self._domain_objects
+        xml_2 = safe(xml_2, self._domain_objects)
         module_data = self._get_module_data(xml_1, locator, mod_type, xml_2)
         appl.vendor_name = module_data["vendor_name"]
         appl.model = check_model(module_data["vendor_model"], appl.vendor_name)
@@ -56,7 +56,8 @@ def _appl_heater_central_info(
 
         # Find the valid heater_central
         # xml_2 self._appliances for legacy, self._domain_objects for actual
-        self._heater_id = check_heater_central(xml_2 or self._domain_objects)
+        xml_2 = safe(xml_2, self._domain_objects)
+        self._heater_id = check_heater_central(xml_2)
 
         #  Info for On-Off device
         if self._on_off_device:
@@ -72,7 +73,7 @@ def _appl_heater_central_info(
         mod_type = "boiler_state"
         # xml_1: appliance
         # xml_3: self._modules for legacy, self._domain_objects for actual
-        xml_3 = xml_3 or self._domain_objects
+        xml_3 = safe(xml_3, self._domain_objects)
         module_data = self._get_module_data(xml_1, locator_1, mod_type, xml_3)
         if not module_data["contents"]:
             module_data = self._get_module_data(xml_1, locator_2, mod_type, xml_3)

plugwise/util.py

@@ -113,6 +113,21 @@ def power_data_local_format(
     return format_measure(val, attrs_uom)
 
 
+def remove_empty_platform_dicts(data: DeviceData) -> None:
+    """Helper-function for removing any empty platform dicts."""
+    if not data["binary_sensors"]:
+        data.pop("binary_sensors")
+    if not data["sensors"]:
+        data.pop("sensors")
+    if not data["switches"]:
+        data.pop("switches")
+
+
+def safe(value, default):
+    """Return default when value is None."""
+    return value if value is not None else default
+
+
 # NOTE: this function version_to_model is shared between Smile and USB
 def version_to_model(version: str | None) -> str | None:
     """Translate hardware_version to device type."""
@@ -128,13 +143,3 @@ def version_to_model(version: str | None) -> str | None:
         model = HW_MODELS.get(version[-2:] + version[-4:-2] + version[-6:-4])
 
     return model if model is not None else "Unknown"
-
-
-def remove_empty_platform_dicts(data: DeviceData) -> None:
-    """Helper-function for removing any empty platform dicts."""
-    if not data["binary_sensors"]:
-        data.pop("binary_sensors")
-    if not data["sensors"]:
-        data.pop("sensors")
-    if not data["switches"]:
-        data.pop("switches")