From cb0a7589ce01e2b024fbb707a59ebf3f4c1f9055 Mon Sep 17 00:00:00 2001 From: Tobias Sauerwein Date: Thu, 8 Jul 2021 09:30:54 +0200 Subject: [PATCH] Use class properties in netatmo (#52705) --- homeassistant/components/netatmo/camera.py | 2 +- homeassistant/components/netatmo/light.py | 4 ++-- homeassistant/components/netatmo/sensor.py | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/homeassistant/components/netatmo/camera.py b/homeassistant/components/netatmo/camera.py index 431aa814bde..798156b7411 100644 --- a/homeassistant/components/netatmo/camera.py +++ b/homeassistant/components/netatmo/camera.py @@ -330,7 +330,7 @@ class NetatmoCamera(NetatmoBase, Camera): async def _service_set_camera_light(self, **kwargs): """Service to set light mode.""" mode = kwargs.get(ATTR_CAMERA_LIGHT_MODE) - _LOGGER.debug("Turn %s camera light for '%s'", mode, self._attr_name) + _LOGGER.debug("Turn %s camera light for '%s'", mode, self.name) await self._data.async_set_state( home_id=self._home_id, camera_id=self._id, diff --git a/homeassistant/components/netatmo/light.py b/homeassistant/components/netatmo/light.py index 3ad9db8ae7c..07488ad03b5 100644 --- a/homeassistant/components/netatmo/light.py +++ b/homeassistant/components/netatmo/light.py @@ -126,7 +126,7 @@ class NetatmoLight(NetatmoBase, LightEntity): async def async_turn_on(self, **kwargs): """Turn camera floodlight on.""" - _LOGGER.debug("Turn camera '%s' on", self._attr_name) + _LOGGER.debug("Turn camera '%s' on", self.name) await self._data.async_set_state( home_id=self._home_id, camera_id=self._id, @@ -135,7 +135,7 @@ class NetatmoLight(NetatmoBase, LightEntity): async def async_turn_off(self, **kwargs): """Turn camera floodlight into auto mode.""" - _LOGGER.debug("Turn camera '%s' to auto mode", self._attr_name) + _LOGGER.debug("Turn camera '%s' to auto mode", self.name) await self._data.async_set_state( home_id=self._home_id, camera_id=self._id, diff --git a/homeassistant/components/netatmo/sensor.py b/homeassistant/components/netatmo/sensor.py index e8e142d7f16..a6ba3fd1c57 100644 --- a/homeassistant/components/netatmo/sensor.py +++ b/homeassistant/components/netatmo/sensor.py @@ -366,13 +366,13 @@ class NetatmoSensor(NetatmoBase, SensorEntity): @property def available(self): """Return entity availability.""" - return self._attr_state is not None + return self.state is not None @callback def async_update_callback(self): """Update the entity's state.""" if self._data is None: - if self._attr_state is None: + if self.state is None: return _LOGGER.warning("No data from update") self._attr_state = None @@ -383,7 +383,7 @@ class NetatmoSensor(NetatmoBase, SensorEntity): ) if data is None: - if self._attr_state: + if self.state: _LOGGER.debug( "No data found for %s - %s (%s)", self.name, @@ -410,7 +410,7 @@ class NetatmoSensor(NetatmoBase, SensorEntity): else: self._attr_state = state except KeyError: - if self._attr_state: + if self.state: _LOGGER.debug("No %s data found for %s", self.type, self._device_name) self._attr_state = None return @@ -614,7 +614,7 @@ class NetatmoPublicSensor(NetatmoBase, SensorEntity): data = self._data.get_latest_gust_strengths() if data is None: - if self._attr_state is None: + if self.state is None: return _LOGGER.debug( "No station provides %s data in the area %s", self.type, self._area_name @@ -628,5 +628,5 @@ class NetatmoPublicSensor(NetatmoBase, SensorEntity): elif self._mode == "max": self._attr_state = max(values) - self._attr_available = self._attr_state is not None + self._attr_available = self.state is not None self.async_write_ha_state()