Fixes from additional review on parent

Author: Tom Scholten

homeassistant/components/plugwise/climate.py

@@ -46,9 +46,9 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
         "zone_thermostat",
         "thermostatic_radiator_valve",
     ]
-    all_entities = api.get_all_devices()
+    all_devices = api.get_all_devices()
 
-    for dev_id, device in all_entities.items():
+    for dev_id, device in all_devices.items():
 
         if device["class"] not in thermostat_classes:
             continue
@@ -260,15 +260,12 @@ def _process_data(self):
         if "active_preset" in climate_data:
             self._preset_mode = climate_data["active_preset"]
 
-        if "heating_state" in heater_central_data:
-            if heater_central_data["heating_state"] is not None:
-                self._heating_state = heater_central_data["heating_state"]
-        if "cooling_state" in heater_central_data:
-            if heater_central_data["cooling_state"] is not None:
-                self._cooling_state = heater_central_data["cooling_state"]
-        if "compressor_state" in heater_central_data:
-            if heater_central_data["compressor_state"] is not None:
-                self._compressor_state = heater_central_data["compressor_state"]
+        if heater_central_data.get("heating_state") is not None:
+            self._heating_state = heater_central_data["heating_state"]
+        if heater_central_data.get("cooling_state") is not None:
+            self._cooling_state = heater_central_data["cooling_state"]
+        if heater_central_data.get("compressor_state") is not None:
+            self._compressor_state = heater_central_data["compressor_state"]
 
         if self._schema_status:
             self._hvac_mode = HVAC_MODE_AUTO

homeassistant/components/plugwise/config_flow.py

@@ -47,7 +47,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     async def async_step_user(self, user_input=None):
         """Handle the initial step."""
         errors = {}
-        api = None
+
         if user_input is not None:
 
             try:

homeassistant/components/plugwise/manifest.json

@@ -3,7 +3,6 @@
   "name": "Plugwise",
   "documentation": "https://www.home-assistant.io/integrations/plugwise",
   "requirements": ["Plugwise_Smile==0.2.10"],
-  "dependencies": [],
   "codeowners": ["@CoMPaTech", "@bouwew"],
   "config_flow": true
 }

homeassistant/components/plugwise/sensor.py

@@ -163,9 +163,9 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     coordinator = hass.data[DOMAIN][config_entry.entry_id]["coordinator"]
 
     entities = []
-    all_entities = api.get_all_devices()
+    all_devices = api.get_all_devices()
     single_thermostat = api.single_master_thermostat()
-    for dev_id, entity in all_entities.items():
+    for dev_id, entity in all_devices.items():
         data = api.get_device_data(dev_id)
         for sensor, sensor_type in SENSOR_MAP.items():
             if sensor in data: