Fix and copy to legacy

Author: bouwew

plugwise/helper.py

@@ -604,7 +604,7 @@ def _appliance_measurements(
         # Count only the items in the binary_sensors, sensors and
         # switches dicts, and the single data items in data
         total_bsssw_dict_items = sum(
-            len(data.get(key, {})) for key in ["binary_sensors", "sensors", "switches"]
+            len(data.get(key, {})) for key in ("binary_sensors", "sensors", "switches")
         )
         self._count += total_bsssw_dict_items + len(data) - len(
             [k for k in data if isinstance(data[k], dict)]

plugwise/legacy/helper.py

@@ -360,11 +360,14 @@ def _appliance_measurements(
                     appl_i_loc.text, ENERGY_WATT_HOUR
                 )
 
-        self._count += len(data["binary_sensors"])
-        self._count += len(data["sensors"])
-        self._count += len(data["switches"])
-        # Don't count the above top-level dicts, only the remaining single items
-        self._count += len(data) - 3
+        # Count only the items in the binary_sensors, sensors and
+        # switches dicts, and the single data items in data
+        total_bsssw_dict_items = sum(
+            len(data.get(key, {})) for key in ("binary_sensors", "sensors", "switches")
+        )
+        self._count += total_bsssw_dict_items + len(data) - len(
+            [k for k in data if isinstance(data[k], dict)]
+        )
 
     def _get_actuator_functionalities(
         self,