Clean up

Author: bouwew

plugwise/common.py

@@ -171,7 +171,7 @@ def _power_data_energy_diff(
             diff = 1
             if "produced" in measurement:
                 diff = -1
-            if net_string not in direct_data["sensors"]:
+            if net_string not in data["sensors"]:
                 tmp_val: float | int = 0
             else:
                 tmp_val = data["sensors"][net_string]

plugwise/helper.py

@@ -552,7 +552,7 @@ def _power_data_from_location(self, loc_id: str) -> GwEntityData:
 
         Collect the power-data based on Location ID, from LOCATIONS.
         """
-        direct_data: GwEntityData = {"sensors": {}}
+        data: GwEntityData = {"sensors": {}}
         loc = Munch()
         log_list: list[str] = ["point_log", "cumulative_log", "interval_log"]
         t_string = "tariff"
@@ -561,10 +561,10 @@ def _power_data_from_location(self, loc_id: str) -> GwEntityData:
         loc.logs = search.find(f'./location[@id="{loc_id}"]/logs')
         for loc.measurement, loc.attrs in P1_MEASUREMENTS.items():
             for loc.log_type in log_list:
-                self._collect_power_values(direct_data, loc, t_string)
+                self._collect_power_values(data, loc, t_string)
 
-        self._count += len(direct_data["sensors"])
-        return direct_data
+        self._count += len(data["sensors"])
+        return data
 
     def _appliance_measurements(
         self,

plugwise/legacy/helper.py

@@ -316,7 +316,7 @@ def _power_data_from_modules(self) -> GwEntityData:
 
         Collect the power-data from MODULES (P1 legacy only).
         """
-        direct_data: GwEntityData = {"sensors": {}}
+        data: GwEntityData = {"sensors": {}}
         loc = Munch()
         mod_list: list[str] = ["interval_meter", "cumulative_meter", "point_meter"]
         t_string = "tariff_indicator"
@@ -327,10 +327,10 @@ def _power_data_from_modules(self) -> GwEntityData:
             loc.meas_list = loc.measurement.split("_")
             for loc.logs in mod_logs:
                 for loc.log_type in mod_list:
-                    self._collect_power_values(direct_data, loc, t_string, legacy=True)
+                    self._collect_power_values(data, loc, t_string, legacy=True)
 
-        self._count += len(direct_data["sensors"])
-        return direct_data
+        self._count += len(data["sensors"])
+        return data
 
     def _appliance_measurements(
         self,