Move SensorEntity last in the inheritance tree (#48230)

homeassistant/components/abode/sensor.py

@@ -34,7 +34,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     async_add_entities(entities)
 
 
-class AbodeSensor(SensorEntity, AbodeDevice):
+class AbodeSensor(AbodeDevice, SensorEntity):
     """A sensor implementation for Abode devices."""
 
     def __init__(self, data, device, sensor_type):

homeassistant/components/accuweather/sensor.py

@@ -49,7 +49,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     async_add_entities(sensors, False)
 
 
-class AccuWeatherSensor(SensorEntity, CoordinatorEntity):
+class AccuWeatherSensor(CoordinatorEntity, SensorEntity):
     """Define an AccuWeather entity."""
 
     def __init__(self, name, kind, coordinator, forecast_day=None):

homeassistant/components/acmeda/sensor.py

@@ -30,7 +30,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     )
 
 
-class AcmedaBattery(SensorEntity, AcmedaBase):
+class AcmedaBattery(AcmedaBase, SensorEntity):
     """Representation of a Acmeda cover device."""
 
     device_class = DEVICE_CLASS_BATTERY

homeassistant/components/adguard/sensor.py

@@ -49,7 +49,7 @@ async def async_setup_entry(
     async_add_entities(sensors, True)
 
 
-class AdGuardHomeSensor(SensorEntity, AdGuardHomeDeviceEntity):
+class AdGuardHomeSensor(AdGuardHomeDeviceEntity, SensorEntity):
     """Defines a AdGuard Home sensor."""
 
     def __init__(

homeassistant/components/ads/sensor.py

@@ -43,7 +43,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     add_entities([entity])
 
 
-class AdsSensor(SensorEntity, AdsEntity):
+class AdsSensor(AdsEntity, SensorEntity):
     """Representation of an ADS sensor entity."""
 
     def __init__(self, ads_hub, ads_var, ads_type, name, unit_of_measurement, factor):

homeassistant/components/advantage_air/sensor.py

@@ -41,7 +41,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     )
 
 
-class AdvantageAirTimeTo(SensorEntity, AdvantageAirEntity):
+class AdvantageAirTimeTo(AdvantageAirEntity, SensorEntity):
     """Representation of Advantage Air timer control."""
 
     def __init__(self, instance, ac_key, action):
@@ -83,7 +83,7 @@ class AdvantageAirTimeTo(SensorEntity, AdvantageAirEntity):
         await self.async_change({self.ac_key: {"info": {self._time_key: value}}})
 
 
-class AdvantageAirZoneVent(SensorEntity, AdvantageAirEntity):
+class AdvantageAirZoneVent(AdvantageAirEntity, SensorEntity):
     """Representation of Advantage Air Zone Vent Sensor."""
 
     @property
@@ -116,7 +116,7 @@ class AdvantageAirZoneVent(SensorEntity, AdvantageAirEntity):
         return "mdi:fan-off"
 
 
-class AdvantageAirZoneSignal(SensorEntity, AdvantageAirEntity):
+class AdvantageAirZoneSignal(AdvantageAirEntity, SensorEntity):
     """Representation of Advantage Air Zone wireless signal sensor."""
 
     @property

homeassistant/components/aemet/sensor.py

@@ -58,7 +58,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     async_add_entities(entities)
 
 
-class AemetSensor(SensorEntity, AbstractAemetSensor):
+class AemetSensor(AbstractAemetSensor, SensorEntity):
     """Implementation of an AEMET OpenData sensor."""
 
     def __init__(
@@ -81,7 +81,7 @@ class AemetSensor(SensorEntity, AbstractAemetSensor):
         return self._weather_coordinator.data.get(self._sensor_type)
 
 
-class AemetForecastSensor(SensorEntity, AbstractAemetSensor):
+class AemetForecastSensor(AbstractAemetSensor, SensorEntity):
     """Implementation of an AEMET OpenData forecast sensor."""
 
     def __init__(

homeassistant/components/airly/sensor.py

@@ -73,7 +73,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     async_add_entities(sensors, False)
 
 
-class AirlySensor(SensorEntity, CoordinatorEntity):
+class AirlySensor(CoordinatorEntity, SensorEntity):
     """Define an Airly sensor."""
 
     def __init__(self, coordinator, name, kind):

homeassistant/components/airnow/sensor.py

@@ -60,7 +60,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     async_add_entities(sensors, False)
 
 
-class AirNowSensor(SensorEntity, CoordinatorEntity):
+class AirNowSensor(CoordinatorEntity, SensorEntity):
     """Define an AirNow sensor."""
 
     def __init__(self, coordinator, kind):

homeassistant/components/airvisual/sensor.py

@@ -139,7 +139,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     async_add_entities(sensors, True)
 
 
-class AirVisualGeographySensor(SensorEntity, AirVisualEntity):
+class AirVisualGeographySensor(AirVisualEntity, SensorEntity):
     """Define an AirVisual sensor related to geography data via the Cloud API."""
 
     def __init__(self, coordinator, config_entry, kind, name, icon, unit, locale):
@@ -237,7 +237,7 @@ class AirVisualGeographySensor(SensorEntity, AirVisualEntity):
             self._attrs.pop(ATTR_LONGITUDE, None)
 
 
-class AirVisualNodeProSensor(SensorEntity, AirVisualEntity):
+class AirVisualNodeProSensor(AirVisualEntity, SensorEntity):
     """Define an AirVisual sensor related to a Node/Pro unit."""
 
     def __init__(self, coordinator, kind, name, device_class, unit):

homeassistant/components/ambient_station/sensor.py

@@ -37,7 +37,7 @@ async def async_setup_entry(hass, entry, async_add_entities):
     async_add_entities(sensor_list, True)
 
 
-class AmbientWeatherSensor(SensorEntity, AmbientWeatherEntity):
+class AmbientWeatherSensor(AmbientWeatherEntity, SensorEntity):
     """Define an Ambient sensor."""
 
     def __init__(

homeassistant/components/android_ip_webcam/sensor.py

@@ -31,7 +31,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
     async_add_entities(all_sensors, True)
 
 
-class IPWebcamSensor(SensorEntity, AndroidIPCamEntity):
+class IPWebcamSensor(AndroidIPCamEntity, SensorEntity):
     """Representation of a IP Webcam sensor."""
 
     def __init__(self, name, host, ipcam, sensor):

homeassistant/components/asuswrt/sensor.py

@@ -98,7 +98,7 @@ async def async_setup_entry(
     async_add_entities(entities, True)
 
 
-class AsusWrtSensor(SensorEntity, CoordinatorEntity):
+class AsusWrtSensor(CoordinatorEntity, SensorEntity):
     """Representation of a AsusWrt sensor."""
 
     def __init__(

homeassistant/components/atag/sensor.py

@@ -30,7 +30,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     async_add_entities([AtagSensor(coordinator, sensor) for sensor in SENSORS])
 
 
-class AtagSensor(SensorEntity, AtagEntity):
+class AtagSensor(AtagEntity, SensorEntity):
     """Representation of a AtagOne Sensor."""
 
     def __init__(self, coordinator, sensor):

homeassistant/components/august/sensor.py

@@ -117,7 +117,7 @@ async def _async_migrate_old_unique_ids(hass, devices):
             registry.async_update_entity(old_entity_id, new_unique_id=device.unique_id)
 
 
-class AugustOperatorSensor(SensorEntity, AugustEntityMixin, RestoreEntity):
+class AugustOperatorSensor(AugustEntityMixin, RestoreEntity, SensorEntity):
     """Representation of an August lock operation sensor."""
 
     def __init__(self, data, device):
@@ -216,7 +216,7 @@ class AugustOperatorSensor(SensorEntity, AugustEntityMixin, RestoreEntity):
         return f"{self._device_id}_lock_operator"
 
 
-class AugustBatterySensor(SensorEntity, AugustEntityMixin):
+class AugustBatterySensor(AugustEntityMixin, SensorEntity):
     """Representation of an August sensor."""
 
     def __init__(self, data, sensor_type, device, old_device):

homeassistant/components/aurora/sensor.py

@@ -19,7 +19,7 @@ async def async_setup_entry(hass, entry, async_add_entries):
     async_add_entries([entity])
 
 
-class AuroraSensor(SensorEntity, AuroraEntity):
+class AuroraSensor(AuroraEntity, SensorEntity):
     """Implementation of an aurora sensor."""
 
     @property

homeassistant/components/awair/sensor.py

@@ -84,7 +84,7 @@ async def async_setup_entry(
     async_add_entities(sensors)
 
 
-class AwairSensor(SensorEntity, CoordinatorEntity):
+class AwairSensor(CoordinatorEntity, SensorEntity):
     """Defines an Awair sensor entity."""
 
     def __init__(

homeassistant/components/azure_devops/sensor.py

@@ -56,7 +56,7 @@ async def async_setup_entry(
     async_add_entities(sensors, True)
 
 
-class AzureDevOpsSensor(SensorEntity, AzureDevOpsDeviceEntity):
+class AzureDevOpsSensor(AzureDevOpsDeviceEntity, SensorEntity):
     """Defines a Azure DevOps sensor."""
 
     def __init__(

homeassistant/components/blebox/sensor.py

@@ -14,7 +14,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     )
 
 
-class BleBoxSensorEntity(SensorEntity, BleBoxEntity):
+class BleBoxSensorEntity(BleBoxEntity, SensorEntity):
     """Representation of a BleBox sensor feature."""
 
     @property

homeassistant/components/bmw_connected_drive/sensor.py

@@ -67,7 +67,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     async_add_entities(entities, True)
 
 
-class BMWConnectedDriveSensor(SensorEntity, BMWConnectedDriveBaseEntity):
+class BMWConnectedDriveSensor(BMWConnectedDriveBaseEntity, SensorEntity):
     """Representation of a BMW vehicle sensor."""
 
     def __init__(self, account, vehicle, attribute: str, attribute_info):

homeassistant/components/brother/sensor.py

@@ -57,7 +57,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     async_add_entities(sensors, False)
 
 
-class BrotherPrinterSensor(SensorEntity, CoordinatorEntity):
+class BrotherPrinterSensor(CoordinatorEntity, SensorEntity):
     """Define an Brother Printer sensor."""
 
     def __init__(self, coordinator, kind, device_info):

homeassistant/components/canary/sensor.py

@@ -78,7 +78,7 @@ async def async_setup_entry(
     async_add_entities(sensors, True)
 
 
-class CanarySensor(SensorEntity, CoordinatorEntity):
+class CanarySensor(CoordinatorEntity, SensorEntity):
     """Representation of a Canary sensor."""
 
     def __init__(self, coordinator, sensor_type, location, device):

homeassistant/components/cert_expiry/sensor.py

@@ -76,7 +76,7 @@ class CertExpiryEntity(CoordinatorEntity):
         }
 
 
-class SSLCertificateTimestamp(SensorEntity, CertExpiryEntity):
+class SSLCertificateTimestamp(CertExpiryEntity, SensorEntity):
     """Implementation of the Cert Expiry timestamp sensor."""
 
     @property

homeassistant/components/coronavirus/sensor.py

@@ -24,7 +24,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     )
 
 
-class CoronavirusSensor(SensorEntity, CoordinatorEntity):
+class CoronavirusSensor(CoordinatorEntity, SensorEntity):
     """Sensor representing corona virus data."""
 
     name = None

homeassistant/components/deconz/sensor.py

@@ -122,7 +122,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     )
 
 
-class DeconzSensor(SensorEntity, DeconzDevice):
+class DeconzSensor(DeconzDevice, SensorEntity):
     """Representation of a deCONZ sensor."""
 
     TYPE = DOMAIN
@@ -186,7 +186,7 @@ class DeconzSensor(SensorEntity, DeconzDevice):
         return attr
 
 
-class DeconzBattery(SensorEntity, DeconzDevice):
+class DeconzBattery(DeconzDevice, SensorEntity):
     """Battery class for when a device is only represented as an event."""
 
     TYPE = DOMAIN

homeassistant/components/derivative/sensor.py

@@ -86,7 +86,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
     async_add_entities([derivative])
 
 
-class DerivativeSensor(SensorEntity, RestoreEntity):
+class DerivativeSensor(RestoreEntity, SensorEntity):
     """Representation of an derivative sensor."""
 
     def __init__(

homeassistant/components/devolo_home_control/sensor.py

@@ -66,7 +66,7 @@ async def async_setup_entry(
     async_add_entities(entities, False)
 
 
-class DevoloMultiLevelDeviceEntity(SensorEntity, DevoloDeviceEntity):
+class DevoloMultiLevelDeviceEntity(DevoloDeviceEntity, SensorEntity):
     """Abstract representation of a multi level sensor within devolo Home Control."""
 
     @property

homeassistant/components/dexcom/sensor.py

@@ -17,7 +17,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     async_add_entities(sensors, False)
 
 
-class DexcomGlucoseValueSensor(SensorEntity, CoordinatorEntity):
+class DexcomGlucoseValueSensor(CoordinatorEntity, SensorEntity):
     """Representation of a Dexcom glucose value sensor."""
 
     def __init__(self, coordinator, username, unit_of_measurement):
@@ -59,7 +59,7 @@ class DexcomGlucoseValueSensor(SensorEntity, CoordinatorEntity):
         return self._unique_id
 
 
-class DexcomGlucoseTrendSensor(SensorEntity, CoordinatorEntity):
+class DexcomGlucoseTrendSensor(CoordinatorEntity, SensorEntity):
     """Representation of a Dexcom glucose trend sensor."""
 
     def __init__(self, coordinator, username):

homeassistant/components/dyson/sensor.py

@@ -101,7 +101,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     add_entities(devices)
 
 
-class DysonSensor(SensorEntity, DysonEntity):
+class DysonSensor(DysonEntity, SensorEntity):
     """Representation of a generic Dyson sensor."""
 
     def __init__(self, device, sensor_type):

homeassistant/components/eafm/sensor.py

@@ -78,7 +78,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     await coordinator.async_refresh()
 
 
-class Measurement(SensorEntity, CoordinatorEntity):
+class Measurement(CoordinatorEntity, SensorEntity):
     """A gauge at a flood monitoring station."""
 
     attribution = "This uses Environment Agency flood and river level data from the real-time data API"

homeassistant/components/econet/sensor.py

@@ -48,7 +48,7 @@ async def async_setup_entry(hass, entry, async_add_entities):
     async_add_entities(sensors)
 
 
-class EcoNetSensor(SensorEntity, EcoNetEntity):
+class EcoNetSensor(EcoNetEntity, SensorEntity):
     """Define a Econet sensor."""
 
     def __init__(self, econet_device, device_name):

homeassistant/components/eight_sleep/sensor.py

@@ -67,7 +67,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
     async_add_entities(all_sensors, True)
 
 
-class EightHeatSensor(SensorEntity, EightSleepHeatEntity):
+class EightHeatSensor(EightSleepHeatEntity, SensorEntity):
     """Representation of an eight sleep heat-based sensor."""
 
     def __init__(self, name, eight, sensor):
@@ -120,7 +120,7 @@ class EightHeatSensor(SensorEntity, EightSleepHeatEntity):
         }
 
 
-class EightUserSensor(SensorEntity, EightSleepUserEntity):
+class EightUserSensor(EightSleepUserEntity, SensorEntity):
     """Representation of an eight sleep user-based sensor."""
 
     def __init__(self, name, eight, sensor, units):
@@ -290,7 +290,7 @@ class EightUserSensor(SensorEntity, EightSleepUserEntity):
         return state_attr
 
 
-class EightRoomSensor(SensorEntity, EightSleepUserEntity):
+class EightRoomSensor(EightSleepUserEntity, SensorEntity):
     """Representation of an eight sleep room sensor."""
 
     def __init__(self, name, eight, sensor, units):

homeassistant/components/elkm1/sensor.py

@@ -68,7 +68,7 @@ def temperature_to_state(temperature, undefined_temperature):
     return temperature if temperature > undefined_temperature else None
 
 
-class ElkSensor(SensorEntity, ElkAttachedEntity):
+class ElkSensor(ElkAttachedEntity, SensorEntity):
     """Base representation of Elk-M1 sensor."""
 
     def __init__(self, element, elk, elk_data):

homeassistant/components/enocean/sensor.py

@@ -101,7 +101,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
         add_entities([EnOceanWindowHandle(dev_id, dev_name)])
 
 
-class EnOceanSensor(SensorEntity, EnOceanEntity, RestoreEntity):
+class EnOceanSensor(EnOceanEntity, RestoreEntity, SensorEntity):
     """Representation of an  EnOcean sensor device such as a power meter."""
 
     def __init__(self, dev_id, dev_name, sensor_type):

homeassistant/components/enphase_envoy/sensor.py

@@ -156,7 +156,7 @@ async def async_setup_platform(
     async_add_entities(entities)
 
 
-class Envoy(SensorEntity, CoordinatorEntity):
+class Envoy(CoordinatorEntity, SensorEntity):
     """Envoy entity."""
 
     def __init__(self, sensor_type, name, serial_number, unit, coordinator):

homeassistant/components/envisalink/sensor.py

@@ -37,7 +37,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
     async_add_entities(devices)
 
 
-class EnvisalinkSensor(SensorEntity, EnvisalinkDevice):
+class EnvisalinkSensor(EnvisalinkDevice, SensorEntity):
     """Representation of an Envisalink keypad."""
 
     def __init__(self, hass, partition_name, partition_number, info, controller):

homeassistant/components/esphome/sensor.py

@@ -42,7 +42,7 @@ async def async_setup_entry(
 # pylint: disable=invalid-overridden-method
 
 
-class EsphomeSensor(SensorEntity, EsphomeEntity):
+class EsphomeSensor(EsphomeEntity, SensorEntity):
     """A sensor implementation for esphome."""
 
     @property
@@ -89,7 +89,7 @@ class EsphomeSensor(SensorEntity, EsphomeEntity):
         return self._static_info.device_class
 
 
-class EsphomeTextSensor(SensorEntity, EsphomeEntity):
+class EsphomeTextSensor(EsphomeEntity, SensorEntity):
     """A text sensor implementation for ESPHome."""
 
     @property