Optimize, clean up

Author: bouwew

plugwise/helper.py

@@ -232,7 +232,9 @@ def _get_locations(self) -> None:
                 continue
 
             loc.name = location.find("name").text
-            self._loc_data[loc.loc_id] = {"name": loc.name}
+            self._loc_data[loc.loc_id] = {
+                "name": loc.name, "primary": [], "primary_prio": 0, "secondary": []
+            }
             if loc.name != "Home":
                 continue
 
@@ -794,8 +796,6 @@ def _scan_thermostats(self) -> None:
         the result to update the device_class of secondary thermostats.
         """
         self._match_and_rank_thermostats()
-        # for location_id in self._new_locations:
-        #     location = self._loc_data[location_id]
         for location_id, location in self._loc_data.items():
             if location["primary_prio"] != 0:
                 self._new_zones.append(location_id)
@@ -833,10 +833,7 @@ def _match_and_rank_thermostats(self) -> dict[str, ThermoLoc]:
             "zone_thermostat": 2,
             "thermostatic_radiator_valve": 1,
         }
-        # for location_id in self._new_locations:
-        #     location = self._loc_data[location_id]
         for location_id, location in self._loc_data.items():
-            location.update({"primary": [], "primary_prio": 0, "secondary": []})
             for entity_id, entity in self.gw_entities.items():
                 self._rank_thermostat(
                     entity_id, entity, location_id, location, thermo_matching