From f4f98010f9dd2018d87302ba030feac91632ef99 Mon Sep 17 00:00:00 2001
From: Joost Lekkerkerker <joostlek@outlook.com>
Date: Mon, 4 Sep 2023 09:15:01 +0200
Subject: [PATCH] Remove unused attributes from Econet (#99242)

---
 homeassistant/components/econet/__init__.py   |  7 +-----
 homeassistant/components/econet/climate.py    | 22 +++++--------------
 .../components/econet/water_heater.py         | 12 +++++-----
 3 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/homeassistant/components/econet/__init__.py b/homeassistant/components/econet/__init__.py
index 3005993bf99..36cdeb68821 100644
--- a/homeassistant/components/econet/__init__.py
+++ b/homeassistant/components/econet/__init__.py
@@ -13,7 +13,7 @@ from pyeconet.errors import (
 )
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, Platform, UnitOfTemperature
+from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.device_registry import DeviceInfo
@@ -137,8 +137,3 @@ class EcoNetEntity(Entity):
             manufacturer="Rheem",
             name=self._econet.device_name,
         )
-
-    @property
-    def temperature_unit(self):
-        """Return the unit of measurement."""
-        return UnitOfTemperature.FAHRENHEIT
diff --git a/homeassistant/components/econet/climate.py b/homeassistant/components/econet/climate.py
index 7233d135f2e..e77c4face74 100644
--- a/homeassistant/components/econet/climate.py
+++ b/homeassistant/components/econet/climate.py
@@ -16,7 +16,7 @@ from homeassistant.components.climate import (
     HVACMode,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_TEMPERATURE
+from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -62,23 +62,21 @@ async def async_setup_entry(
 
 
 class EcoNetThermostat(EcoNetEntity, ClimateEntity):
-    """Define a Econet thermostat."""
+    """Define an Econet thermostat."""
+
+    _attr_temperature_unit = UnitOfTemperature.FAHRENHEIT
 
     def __init__(self, thermostat):
         """Initialize."""
         super().__init__(thermostat)
-        self._running = thermostat.running
-        self._poll = True
-        self.econet_state_to_ha = {}
-        self.ha_state_to_econet = {}
-        self.op_list = []
+        self._attr_hvac_modes = []
         for mode in self._econet.modes:
             if mode not in [
                 ThermostatOperationMode.UNKNOWN,
                 ThermostatOperationMode.EMERGENCY_HEAT,
             ]:
                 ha_mode = ECONET_STATE_TO_HA[mode]
-                self.op_list.append(ha_mode)
+                self._attr_hvac_modes.append(ha_mode)
 
     @property
     def supported_features(self) -> ClimateEntityFeature:
@@ -142,14 +140,6 @@ class EcoNetThermostat(EcoNetEntity, ClimateEntity):
         """Return true if aux heater."""
         return self._econet.mode == ThermostatOperationMode.EMERGENCY_HEAT
 
-    @property
-    def hvac_modes(self):
-        """Return hvac operation ie. heat, cool mode.
-
-        Needs to be one of HVAC_MODE_*.
-        """
-        return self.op_list
-
     @property
     def hvac_mode(self) -> HVACMode:
         """Return hvac operation ie. heat, cool, mode.
diff --git a/homeassistant/components/econet/water_heater.py b/homeassistant/components/econet/water_heater.py
index c94afd8b5d7..cbaf4551d03 100644
--- a/homeassistant/components/econet/water_heater.py
+++ b/homeassistant/components/econet/water_heater.py
@@ -16,7 +16,7 @@ from homeassistant.components.water_heater import (
     WaterHeaterEntityFeature,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_TEMPERATURE, STATE_OFF
+from homeassistant.const import ATTR_TEMPERATURE, STATE_OFF, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -56,20 +56,20 @@ async def async_setup_entry(
 
 
 class EcoNetWaterHeater(EcoNetEntity, WaterHeaterEntity):
-    """Define a Econet water heater."""
+    """Define an Econet water heater."""
+
+    _attr_should_poll = True  # Override False default from EcoNetEntity
+    _attr_temperature_unit = UnitOfTemperature.FAHRENHEIT
 
     def __init__(self, water_heater):
         """Initialize."""
         super().__init__(water_heater)
         self._running = water_heater.running
-        self._attr_should_poll = True  # Override False default from EcoNetEntity
         self.water_heater = water_heater
-        self.econet_state_to_ha = {}
-        self.ha_state_to_econet = {}
 
     @callback
     def on_update_received(self):
-        """Update was pushed from the ecoent API."""
+        """Update was pushed from the econet API."""
         if self._running != self.water_heater.running:
             # Water heater running state has changed so check usage on next update
             self._attr_should_poll = True