From ee28dd57c1af8f5f21d3b011b617001c2293702f Mon Sep 17 00:00:00 2001 From: Simone Chemelli Date: Thu, 30 Sep 2021 12:15:17 +0200 Subject: [PATCH] Rename var to compliant name in August integration (#56812) --- homeassistant/components/august/binary_sensor.py | 12 +++++------- homeassistant/components/august/sensor.py | 10 +++++----- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/homeassistant/components/august/binary_sensor.py b/homeassistant/components/august/binary_sensor.py index 804a9810a94..9a38cd1e301 100644 --- a/homeassistant/components/august/binary_sensor.py +++ b/homeassistant/components/august/binary_sensor.py @@ -93,7 +93,7 @@ def _native_datetime() -> datetime: class AugustRequiredKeysMixin: """Mixin for required keys.""" - state_provider: Callable[[AugustData, DoorbellDetail], bool] + value_fn: Callable[[AugustData, DoorbellDetail], bool] is_time_based: bool @@ -115,21 +115,21 @@ SENSOR_TYPES_DOORBELL: tuple[AugustBinarySensorEntityDescription, ...] = ( key="doorbell_ding", name="Ding", device_class=DEVICE_CLASS_OCCUPANCY, - state_provider=_retrieve_ding_state, + value_fn=_retrieve_ding_state, is_time_based=True, ), AugustBinarySensorEntityDescription( key="doorbell_motion", name="Motion", device_class=DEVICE_CLASS_MOTION, - state_provider=_retrieve_motion_state, + value_fn=_retrieve_motion_state, is_time_based=True, ), AugustBinarySensorEntityDescription( key="doorbell_online", name="Online", device_class=DEVICE_CLASS_CONNECTIVITY, - state_provider=_retrieve_online_state, + value_fn=_retrieve_online_state, is_time_based=False, ), ) @@ -225,9 +225,7 @@ class AugustDoorbellBinarySensor(AugustEntityMixin, BinarySensorEntity): def _update_from_data(self): """Get the latest state of the sensor.""" self._cancel_any_pending_updates() - self._attr_is_on = self.entity_description.state_provider( - self._data, self._detail - ) + self._attr_is_on = self.entity_description.value_fn(self._data, self._detail) if self.entity_description.is_time_based: self._attr_available = _retrieve_online_state(self._data, self._detail) diff --git a/homeassistant/components/august/sensor.py b/homeassistant/components/august/sensor.py index 263d20be1b6..b6fa767edb7 100644 --- a/homeassistant/components/august/sensor.py +++ b/homeassistant/components/august/sensor.py @@ -55,7 +55,7 @@ T = TypeVar("T", LockDetail, KeypadDetail) class AugustRequiredKeysMixin(Generic[T]): """Mixin for required keys.""" - state_provider: Callable[[T], int | None] + value_fn: Callable[[T], int | None] @dataclass @@ -68,13 +68,13 @@ class AugustSensorEntityDescription( SENSOR_TYPE_DEVICE_BATTERY = AugustSensorEntityDescription[LockDetail]( key="device_battery", name="Battery", - state_provider=_retrieve_device_battery_state, + value_fn=_retrieve_device_battery_state, ) SENSOR_TYPE_KEYPAD_BATTERY = AugustSensorEntityDescription[KeypadDetail]( key="linked_keypad_battery", name="Battery", - state_provider=_retrieve_linked_keypad_battery_state, + value_fn=_retrieve_linked_keypad_battery_state, ) @@ -97,7 +97,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities): for device in batteries["device_battery"]: detail = data.get_device_detail(device.device_id) - if detail is None or SENSOR_TYPE_DEVICE_BATTERY.state_provider(detail) is None: + if detail is None or SENSOR_TYPE_DEVICE_BATTERY.value_fn(detail) is None: _LOGGER.debug( "Not adding battery sensor for %s because it is not present", device.device_name, @@ -268,7 +268,7 @@ class AugustBatterySensor(AugustEntityMixin, SensorEntity, Generic[T]): @callback def _update_from_data(self): """Get the latest state of the sensor.""" - self._attr_native_value = self.entity_description.state_provider(self._detail) + self._attr_native_value = self.entity_description.value_fn(self._detail) self._attr_available = self._attr_native_value is not None @property