From 9e9ba53f0ec7f1e6dbda2c96186104ec571a3e91 Mon Sep 17 00:00:00 2001 From: Erik Montnemery Date: Mon, 22 Mar 2021 20:05:13 +0100 Subject: [PATCH] Move SensorEntity last in the inheritance tree (#48230) --- homeassistant/components/abode/sensor.py | 2 +- homeassistant/components/accuweather/sensor.py | 2 +- homeassistant/components/acmeda/sensor.py | 2 +- homeassistant/components/adguard/sensor.py | 2 +- homeassistant/components/ads/sensor.py | 2 +- homeassistant/components/advantage_air/sensor.py | 6 +++--- homeassistant/components/aemet/sensor.py | 4 ++-- homeassistant/components/airly/sensor.py | 2 +- homeassistant/components/airnow/sensor.py | 2 +- homeassistant/components/airvisual/sensor.py | 4 ++-- homeassistant/components/ambient_station/sensor.py | 2 +- homeassistant/components/android_ip_webcam/sensor.py | 2 +- homeassistant/components/asuswrt/sensor.py | 2 +- homeassistant/components/atag/sensor.py | 2 +- homeassistant/components/august/sensor.py | 4 ++-- homeassistant/components/aurora/sensor.py | 2 +- homeassistant/components/awair/sensor.py | 2 +- homeassistant/components/azure_devops/sensor.py | 2 +- homeassistant/components/blebox/sensor.py | 2 +- homeassistant/components/bmw_connected_drive/sensor.py | 2 +- homeassistant/components/brother/sensor.py | 2 +- homeassistant/components/canary/sensor.py | 2 +- homeassistant/components/cert_expiry/sensor.py | 2 +- homeassistant/components/coronavirus/sensor.py | 2 +- homeassistant/components/deconz/sensor.py | 4 ++-- homeassistant/components/derivative/sensor.py | 2 +- homeassistant/components/devolo_home_control/sensor.py | 2 +- homeassistant/components/dexcom/sensor.py | 4 ++-- homeassistant/components/dyson/sensor.py | 2 +- homeassistant/components/eafm/sensor.py | 2 +- homeassistant/components/econet/sensor.py | 2 +- homeassistant/components/eight_sleep/sensor.py | 6 +++--- homeassistant/components/elkm1/sensor.py | 2 +- homeassistant/components/enocean/sensor.py | 2 +- homeassistant/components/enphase_envoy/sensor.py | 2 +- homeassistant/components/envisalink/sensor.py | 2 +- homeassistant/components/esphome/sensor.py | 4 ++-- 37 files changed, 47 insertions(+), 47 deletions(-) diff --git a/homeassistant/components/abode/sensor.py b/homeassistant/components/abode/sensor.py index 993228c36ac..e3ececb62d9 100644 --- a/homeassistant/components/abode/sensor.py +++ b/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): diff --git a/homeassistant/components/accuweather/sensor.py b/homeassistant/components/accuweather/sensor.py index 89147cc7104..722dd8869be 100644 --- a/homeassistant/components/accuweather/sensor.py +++ b/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): diff --git a/homeassistant/components/acmeda/sensor.py b/homeassistant/components/acmeda/sensor.py index f1961b85589..4f617c5726f 100644 --- a/homeassistant/components/acmeda/sensor.py +++ b/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 diff --git a/homeassistant/components/adguard/sensor.py b/homeassistant/components/adguard/sensor.py index 6f2f0f54beb..dd0400b6592 100644 --- a/homeassistant/components/adguard/sensor.py +++ b/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__( diff --git a/homeassistant/components/ads/sensor.py b/homeassistant/components/ads/sensor.py index 6e7c69d3c2d..933950dcf1b 100644 --- a/homeassistant/components/ads/sensor.py +++ b/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): diff --git a/homeassistant/components/advantage_air/sensor.py b/homeassistant/components/advantage_air/sensor.py index cef70ebb245..19ac584ac2f 100644 --- a/homeassistant/components/advantage_air/sensor.py +++ b/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 diff --git a/homeassistant/components/aemet/sensor.py b/homeassistant/components/aemet/sensor.py index 400952830cc..199b254cb1e 100644 --- a/homeassistant/components/aemet/sensor.py +++ b/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__( diff --git a/homeassistant/components/airly/sensor.py b/homeassistant/components/airly/sensor.py index efadeac94e1..2a52050db15 100644 --- a/homeassistant/components/airly/sensor.py +++ b/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): diff --git a/homeassistant/components/airnow/sensor.py b/homeassistant/components/airnow/sensor.py index f8f5eff6cc7..2d3adc8d1e2 100644 --- a/homeassistant/components/airnow/sensor.py +++ b/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): diff --git a/homeassistant/components/airvisual/sensor.py b/homeassistant/components/airvisual/sensor.py index c4cbf3af22e..1febcec68f4 100644 --- a/homeassistant/components/airvisual/sensor.py +++ b/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): diff --git a/homeassistant/components/ambient_station/sensor.py b/homeassistant/components/ambient_station/sensor.py index 7e8f3d26ec6..732c28c8dc5 100644 --- a/homeassistant/components/ambient_station/sensor.py +++ b/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__( diff --git a/homeassistant/components/android_ip_webcam/sensor.py b/homeassistant/components/android_ip_webcam/sensor.py index de029c39aba..adedb297cd1 100644 --- a/homeassistant/components/android_ip_webcam/sensor.py +++ b/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): diff --git a/homeassistant/components/asuswrt/sensor.py b/homeassistant/components/asuswrt/sensor.py index 30f4163d01b..7e38243e3d6 100644 --- a/homeassistant/components/asuswrt/sensor.py +++ b/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__( diff --git a/homeassistant/components/atag/sensor.py b/homeassistant/components/atag/sensor.py index 163ed669be4..88ccbdc899f 100644 --- a/homeassistant/components/atag/sensor.py +++ b/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): diff --git a/homeassistant/components/august/sensor.py b/homeassistant/components/august/sensor.py index 9b8352a0b96..44597a6485e 100644 --- a/homeassistant/components/august/sensor.py +++ b/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): diff --git a/homeassistant/components/aurora/sensor.py b/homeassistant/components/aurora/sensor.py index 1a34bb604da..d7024cc630a 100644 --- a/homeassistant/components/aurora/sensor.py +++ b/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 diff --git a/homeassistant/components/awair/sensor.py b/homeassistant/components/awair/sensor.py index de39c20eb60..502fa3dc626 100644 --- a/homeassistant/components/awair/sensor.py +++ b/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__( diff --git a/homeassistant/components/azure_devops/sensor.py b/homeassistant/components/azure_devops/sensor.py index a0701ac9839..01018d34c78 100644 --- a/homeassistant/components/azure_devops/sensor.py +++ b/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__( diff --git a/homeassistant/components/blebox/sensor.py b/homeassistant/components/blebox/sensor.py index 688d2931461..c1b9d8501c1 100644 --- a/homeassistant/components/blebox/sensor.py +++ b/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 diff --git a/homeassistant/components/bmw_connected_drive/sensor.py b/homeassistant/components/bmw_connected_drive/sensor.py index 5c85312d959..38415d0006f 100644 --- a/homeassistant/components/bmw_connected_drive/sensor.py +++ b/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): diff --git a/homeassistant/components/brother/sensor.py b/homeassistant/components/brother/sensor.py index 10cc3979207..0b614ffa582 100644 --- a/homeassistant/components/brother/sensor.py +++ b/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): diff --git a/homeassistant/components/canary/sensor.py b/homeassistant/components/canary/sensor.py index e4c6190ff99..d7a6648857a 100644 --- a/homeassistant/components/canary/sensor.py +++ b/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): diff --git a/homeassistant/components/cert_expiry/sensor.py b/homeassistant/components/cert_expiry/sensor.py index bf80f8b8fb5..a05acdb5d77 100644 --- a/homeassistant/components/cert_expiry/sensor.py +++ b/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 diff --git a/homeassistant/components/coronavirus/sensor.py b/homeassistant/components/coronavirus/sensor.py index 58e6760a85d..472b8bc8d1c 100644 --- a/homeassistant/components/coronavirus/sensor.py +++ b/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 diff --git a/homeassistant/components/deconz/sensor.py b/homeassistant/components/deconz/sensor.py index 8f23b47a1b9..0646ad09a31 100644 --- a/homeassistant/components/deconz/sensor.py +++ b/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 diff --git a/homeassistant/components/derivative/sensor.py b/homeassistant/components/derivative/sensor.py index 72d0186d94d..12fc4ddd7ba 100644 --- a/homeassistant/components/derivative/sensor.py +++ b/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__( diff --git a/homeassistant/components/devolo_home_control/sensor.py b/homeassistant/components/devolo_home_control/sensor.py index f125448b4cc..e3c16670dfd 100644 --- a/homeassistant/components/devolo_home_control/sensor.py +++ b/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 diff --git a/homeassistant/components/dexcom/sensor.py b/homeassistant/components/dexcom/sensor.py index 09c7ff4e051..730a1824e1a 100644 --- a/homeassistant/components/dexcom/sensor.py +++ b/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): diff --git a/homeassistant/components/dyson/sensor.py b/homeassistant/components/dyson/sensor.py index 356bfc61cb2..cff4b8f5501 100644 --- a/homeassistant/components/dyson/sensor.py +++ b/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): diff --git a/homeassistant/components/eafm/sensor.py b/homeassistant/components/eafm/sensor.py index 8fa2a47c157..b3d726f9cd3 100644 --- a/homeassistant/components/eafm/sensor.py +++ b/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" diff --git a/homeassistant/components/econet/sensor.py b/homeassistant/components/econet/sensor.py index 8198eb75045..05fa1b734ea 100644 --- a/homeassistant/components/econet/sensor.py +++ b/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): diff --git a/homeassistant/components/eight_sleep/sensor.py b/homeassistant/components/eight_sleep/sensor.py index f5a0d1b1f8d..ae0854ec244 100644 --- a/homeassistant/components/eight_sleep/sensor.py +++ b/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): diff --git a/homeassistant/components/elkm1/sensor.py b/homeassistant/components/elkm1/sensor.py index c8d4fd722bb..e33196a08c0 100644 --- a/homeassistant/components/elkm1/sensor.py +++ b/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): diff --git a/homeassistant/components/enocean/sensor.py b/homeassistant/components/enocean/sensor.py index 18362a3c6ac..1814efb9c87 100644 --- a/homeassistant/components/enocean/sensor.py +++ b/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): diff --git a/homeassistant/components/enphase_envoy/sensor.py b/homeassistant/components/enphase_envoy/sensor.py index 794c0ca2dbd..dd1b10c870b 100644 --- a/homeassistant/components/enphase_envoy/sensor.py +++ b/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): diff --git a/homeassistant/components/envisalink/sensor.py b/homeassistant/components/envisalink/sensor.py index ff4c73500f9..6fd7f32c6fe 100644 --- a/homeassistant/components/envisalink/sensor.py +++ b/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): diff --git a/homeassistant/components/esphome/sensor.py b/homeassistant/components/esphome/sensor.py index 99f66f48029..d751109c159 100644 --- a/homeassistant/components/esphome/sensor.py +++ b/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