Reduce complexity 3

Author: bouwew

plugwise/helper.py

@@ -531,8 +531,7 @@ def _get_measurement_data(self, dev_id: str) -> DeviceZoneData:
             for toggle, name in TOGGLES.items():
                 self._get_toggle_state(appliance, toggle, name, data)
 
-            if appliance.find("type").text in ACTUATOR_CLASSES:
-                self._get_actuator_functionalities(appliance, device, data)
+            self._get_actuator_functionalities(appliance, device, data)
 
         if dev_id == self.gateway_id and self.smile(ADAM):
             self._get_regulation_mode(appliance, data)
@@ -546,7 +545,8 @@ def _get_measurement_data(self, dev_id: str) -> DeviceZoneData:
             data.pop("c_heating_state")
             self._count -= 1
 
-        self._update_anna_cooling(dev_id, data)
+        if self._is_thermostat and self.smile(ANNA):
+            self._update_anna_cooling(dev_id, data)
 
     def _power_data_from_location(self, loc_id: str) -> DeviceZoneData:
         """Helper-function for smile.py: _get_device_zone_data().
@@ -640,6 +640,9 @@ def _get_actuator_functionalities(
         self, xml: etree, device: DeviceZoneData, data: DeviceZoneData
     ) -> None:
         """Helper-function for _get_measurement_data()."""
+        if appliance.find("type").text not in ACTUATOR_CLASSES:
+            continue
+
         for item in ACTIVE_ACTUATORS:
             # Skip max_dhw_temperature, not initially valid,
             # skip thermostat for all but zones with thermostats
@@ -746,7 +749,7 @@ def _process_c_heating_state(self, data: DeviceZoneData) -> None:
         """
         # Adam or Anna + OnOff device
         if self._on_off_device:
-            self._process_on_off_device_c_heating_state(self, data)
+            self._process_on_off_device_c_heating_state(data)
 
         # Anna + Elga: use central_heating_state to show heating_state
         if self._elga:
@@ -777,7 +780,7 @@ def _update_anna_cooling(self, dev_id: str, data: DeviceZoneData) -> None:
 
         Support added for Techneco Elga and Thercon Loria/Thermastage.
         """
-        if self._is_thermostat and self.smile(ANNA) and dev_id == self._heater_id:
+        if dev_id == self._heater_id:
             # Anna+Elga: base cooling_state on the elga-status-code
             if "elga_status_code" in data:
                 if data["thermostat_supports_cooling"]: