Improve _all_device_data()

Author: bouwew

plugwise/smile.py

@@ -51,25 +51,23 @@ def _all_device_data(self) -> None:
         """Helper-function for get_all_devices().
         Collect initial data for each device and add to self.gw_data and self.gw_devices.
         """
-        for dev_id, dev_dict in self._devices.items():
-            dev_and_data: dict[str, Any] = dev_dict
+        for device_id, device in self._devices.items():
             temp_bs_dict: dict[str, bool] = {}
             temp_s_dict: dict[str, Any] = {}
-            temp_sw_dict: dict[str, str] = {}
-            data: dict[str, Any] = self._get_device_data(dev_id)
+            temp_sw_dict: dict[str, bool] = {}
 
+            data: dict[str, Any] = self._get_device_data(device_id)
             self._create_dicts_from_data(data, temp_bs_dict, temp_s_dict, temp_sw_dict)
-            self._append_special(dev_id, temp_bs_dict, temp_s_dict)
-
-            dev_and_data.update(data)
+            self._append_special(device_id, temp_bs_dict, temp_s_dict)
+            device.update(data)
             if temp_bs_dict:
-                dev_and_data["binary_sensors"] = temp_bs_dict
+                device["binary_sensors"] = temp_bs_dict
             if temp_s_dict:
-                dev_and_data["sensors"] = temp_s_dict
+                device["sensors"] = temp_s_dict
             if temp_sw_dict:
-                dev_and_data["switches"] = temp_sw_dict
+                device["switches"] = temp_sw_dict
 
-            self.gw_devices[dev_id] = dev_and_data
+            self.gw_devices[device_id] = device
 
         self.gw_data["active_device"] = self._opentherm_device or self._on_off_device
         self.gw_data["cooling_present"] = self._cooling_present