Move temperature conversions to sensor base class (7/8)

homeassistant/components/starline/sensor.py

@@ -69,7 +69,7 @@ def icon(self):
         return self._icon
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the state of the sensor."""
         if self._key == "battery":
             return self._device.battery_level
@@ -90,7 +90,7 @@ def state(self):
         return None
 
     @property
-    def unit_of_measurement(self):
+    def native_unit_of_measurement(self):
         """Get the unit of measurement."""
         if self._key == "balance":
             return self._device.balance.get("currency") or "₽"

homeassistant/components/starlingbank/sensor.py

@@ -79,12 +79,12 @@ def name(self):
         )
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the state of the sensor."""
         return self._state
 
     @property
-    def unit_of_measurement(self):
+    def native_unit_of_measurement(self):
         """Return the unit of measurement."""
         return self._starling_account.currency
 

homeassistant/components/startca/sensor.py

@@ -93,12 +93,12 @@ def name(self):
         return f"{self.client_name} {self._name}"
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the state of the sensor."""
         return self._state
 
     @property
-    def unit_of_measurement(self):
+    def native_unit_of_measurement(self):
         """Return the unit of measurement of this entity, if any."""
         return self._unit_of_measurement
 

homeassistant/components/statistics/sensor.py

@@ -203,12 +203,12 @@ def name(self):
         return self._name
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the state of the sensor."""
         return self.mean if not self.is_binary else self.count
 
     @property
-    def unit_of_measurement(self):
+    def native_unit_of_measurement(self):
         """Return the unit the value is expressed in."""
         return self._unit_of_measurement if not self.is_binary else None
 

homeassistant/components/steam_online/sensor.py

@@ -99,7 +99,7 @@ def entity_id(self):
         return f"sensor.steam_{self._account}"
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the state of the sensor."""
         return self._state
 

homeassistant/components/streamlabswater/sensor.py

@@ -87,12 +87,12 @@ def icon(self):
         return WATER_ICON
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the current daily usage."""
         return self._streamlabs_usage_data.get_daily_usage()
 
     @property
-    def unit_of_measurement(self):
+    def native_unit_of_measurement(self):
         """Return gallons as the unit measurement for water."""
         return VOLUME_GALLONS
 
@@ -110,7 +110,7 @@ def name(self):
         return f"{self._location_name} {NAME_MONTHLY_USAGE}"
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the current monthly usage."""
         return self._streamlabs_usage_data.get_monthly_usage()
 
@@ -124,6 +124,6 @@ def name(self):
         return f"{self._location_name} {NAME_YEARLY_USAGE}"
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the current yearly usage."""
         return self._streamlabs_usage_data.get_yearly_usage()

homeassistant/components/subaru/sensor.py

@@ -203,7 +203,7 @@ def icon(self):
         return None
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the state of the sensor."""
         self.current_value = self.get_current_value()
 
@@ -238,7 +238,7 @@ def state(self):
         return self.current_value
 
     @property
-    def unit_of_measurement(self):
+    def native_unit_of_measurement(self):
         """Return the unit_of_measurement of the device."""
         if self.api_unit in TEMPERATURE_UNITS:
             return self.hass.config.units.temperature_unit

homeassistant/components/suez_water/sensor.py

@@ -62,12 +62,12 @@ def name(self):
         return COMPONENT_NAME
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the state of the sensor."""
         return self._state
 
     @property
-    def unit_of_measurement(self):
+    def native_unit_of_measurement(self):
         """Return the unit of measurement."""
         return VOLUME_LITERS
 

homeassistant/components/supervisord/sensor.py

@@ -50,7 +50,7 @@ def name(self):
         return self._info.get("name")
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the state of the sensor."""
         return self._info.get("statename")
 

homeassistant/components/surepetcare/sensor.py

@@ -60,7 +60,7 @@ def __init__(self, _id: int, spc: SurePetcareAPI) -> None:
 
         self._attr_device_class = DEVICE_CLASS_BATTERY
         self._attr_name = f"{surepy_entity.type.name.capitalize()} {surepy_entity.name.capitalize()} Battery Level"
-        self._attr_unit_of_measurement = PERCENTAGE
+        self._attr_native_unit_of_measurement = PERCENTAGE
         self._attr_unique_id = (
             f"{surepy_entity.household_id}-{surepy_entity.id}-battery"
         )
@@ -75,11 +75,11 @@ def _async_update(self) -> None:
         try:
             per_battery_voltage = state["battery"] / 4
             voltage_diff = per_battery_voltage - SURE_BATT_VOLTAGE_LOW
-            self._attr_state = min(
+            self._attr_native_value = min(
                 int(voltage_diff / SURE_BATT_VOLTAGE_DIFF * 100), 100
             )
         except (KeyError, TypeError):
-            self._attr_state = None
+            self._attr_native_value = None
 
         if state:
             voltage_per_battery = float(state["battery"]) / 4

homeassistant/components/swiss_hydrological_data/sensor.py

@@ -94,14 +94,14 @@ def unique_id(self) -> str:
         return f"{self._station}_{self._condition}"
 
     @property
-    def unit_of_measurement(self):
+    def native_unit_of_measurement(self):
         """Return the unit of measurement of this entity, if any."""
         if self._state is not None:
             return self.hydro_data.data["parameters"][self._condition]["unit"]
         return None
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the state of the sensor."""
         if isinstance(self._state, (int, float)):
             return round(self._state, 2)

homeassistant/components/swiss_public_transport/sensor.py

@@ -84,7 +84,7 @@ def name(self):
         return self._name
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the state of the sensor."""
         return (
             self._opendata.connections[0]["departure"]

homeassistant/components/switcher_kis/sensor.py

@@ -110,7 +110,7 @@ def __init__(
         # Entity class attributes
         self._attr_name = f"{wrapper.name} {description.name}"
         self._attr_icon = description.icon
-        self._attr_unit_of_measurement = description.unit
+        self._attr_native_unit_of_measurement = description.unit
         self._attr_device_class = description.device_class
         self._attr_entity_registry_enabled_default = description.default_enabled
 
@@ -122,6 +122,6 @@ def __init__(
         }
 
     @property
-    def state(self) -> StateType:
+    def native_value(self) -> StateType:
         """Return value of sensor."""
         return getattr(self.wrapper.data, self.attribute)  # type: ignore[no-any-return]

homeassistant/components/syncthing/sensor.py

@@ -105,7 +105,7 @@ def unique_id(self):
         return f"{self._short_server_id}-{self._folder_id}"
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the state of the sensor."""
         return self._state["state"]
 

homeassistant/components/syncthru/sensor.py

@@ -124,7 +124,7 @@ def icon(self):
         return self._icon
 
     @property
-    def unit_of_measurement(self):
+    def native_unit_of_measurement(self):
         """Return the unit of measuremnt."""
         return self._unit_of_measurement
 
@@ -148,7 +148,7 @@ def __init__(self, coordinator, name):
         self._id_suffix = "_main"
 
     @property
-    def state(self):
+    def native_value(self):
         """Set state to human readable version of syncthru status."""
         return SYNCTHRU_STATE_HUMAN[self.syncthru.device_status()]
 
@@ -182,7 +182,7 @@ def extra_state_attributes(self):
         return self.syncthru.toner_status().get(self._color, {})
 
     @property
-    def state(self):
+    def native_value(self):
         """Show amount of remaining toner."""
         return self.syncthru.toner_status().get(self._color, {}).get("remaining")
 
@@ -204,7 +204,7 @@ def extra_state_attributes(self):
         return self.syncthru.drum_status().get(self._color, {})
 
     @property
-    def state(self):
+    def native_value(self):
         """Show amount of remaining drum."""
         return self.syncthru.drum_status().get(self._color, {}).get("remaining")
 
@@ -225,7 +225,7 @@ def extra_state_attributes(self):
         return self.syncthru.input_tray_status().get(self._number, {})
 
     @property
-    def state(self):
+    def native_value(self):
         """Display ready unless there is some error, then display error."""
         tray_state = (
             self.syncthru.input_tray_status().get(self._number, {}).get("newError")
@@ -251,7 +251,7 @@ def extra_state_attributes(self):
         return self.syncthru.output_tray_status().get(self._number, {})
 
     @property
-    def state(self):
+    def native_value(self):
         """Display ready unless there is some error, then display error."""
         tray_state = (
             self.syncthru.output_tray_status().get(self._number, {}).get("status")

homeassistant/components/synology_dsm/sensor.py

@@ -90,7 +90,7 @@ class SynoDSMSensor(SynologyDSMBaseEntity):
     """Mixin for sensor specific attributes."""
 
     @property
-    def unit_of_measurement(self) -> str | None:
+    def native_unit_of_measurement(self) -> str | None:
         """Return the unit the value is expressed in."""
         if self.entity_type in TEMP_SENSORS_KEYS:
             return self.hass.config.units.temperature_unit
@@ -101,7 +101,7 @@ class SynoDSMUtilSensor(SynoDSMSensor, SensorEntity):
     """Representation a Synology Utilisation sensor."""
 
     @property
-    def state(self) -> Any | None:
+    def native_value(self) -> Any | None:
         """Return the state."""
         attr = getattr(self._api.utilisation, self.entity_type)
         if callable(attr):
@@ -133,7 +133,7 @@ class SynoDSMStorageSensor(SynologyDSMDeviceEntity, SynoDSMSensor, SensorEntity)
     """Representation a Synology Storage sensor."""
 
     @property
-    def state(self) -> Any | None:
+    def native_value(self) -> Any | None:
         """Return the state."""
         attr = getattr(self._api.storage, self.entity_type)(self._device_id)
         if attr is None:
@@ -166,7 +166,7 @@ def __init__(
         self._last_boot: str | None = None
 
     @property
-    def state(self) -> Any | None:
+    def native_value(self) -> Any | None:
         """Return the state."""
         attr = getattr(self._api.information, self.entity_type)
         if attr is None: