From f344ed9ef46f1412509dd564adc279a6c3690175 Mon Sep 17 00:00:00 2001 From: Jason Swails Date: Sun, 22 Mar 2020 08:18:59 -0400 Subject: [PATCH 1/3] General code cleanups for lutron_caseta component --- homeassistant/components/lutron_caseta/__init__.py | 4 ++-- homeassistant/components/lutron_caseta/cover.py | 8 ++++---- homeassistant/components/lutron_caseta/light.py | 8 ++++---- homeassistant/components/lutron_caseta/scene.py | 8 ++++---- homeassistant/components/lutron_caseta/switch.py | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/homeassistant/components/lutron_caseta/__init__.py b/homeassistant/components/lutron_caseta/__init__.py index aaac06a6bd5add..4d8ecc5d17bcd5 100644 --- a/homeassistant/components/lutron_caseta/__init__.py +++ b/homeassistant/components/lutron_caseta/__init__.py @@ -82,7 +82,7 @@ def __init__(self, device, bridge): async def async_added_to_hass(self): """Register callbacks.""" self._smartbridge.add_subscriber( - self.device_id, self.async_schedule_update_ha_state + self.device_id, self.async_update_ha_state ) @property @@ -108,7 +108,7 @@ def unique_id(self): @property def device_state_attributes(self): """Return the state attributes.""" - attr = {"Device ID": self.device_id, "Zone ID": self._device["zone"]} + attr = {"device_id": self.device_id, "zone_id": self._device["zone"]} return attr @property diff --git a/homeassistant/components/lutron_caseta/cover.py b/homeassistant/components/lutron_caseta/cover.py index afd669153e0cd6..60c723b7b42c5a 100644 --- a/homeassistant/components/lutron_caseta/cover.py +++ b/homeassistant/components/lutron_caseta/cover.py @@ -17,14 +17,14 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=None): """Set up the Lutron Caseta shades as a cover device.""" - devs = [] + entities = [] bridge = hass.data[LUTRON_CASETA_SMARTBRIDGE] cover_devices = bridge.get_devices_by_domain(DOMAIN) for cover_device in cover_devices: - dev = LutronCasetaCover(cover_device, bridge) - devs.append(dev) + entity = LutronCasetaCover(cover_device, bridge) + entities.append(entity) - async_add_entities(devs, True) + async_add_entities(entities, True) class LutronCasetaCover(LutronCasetaDevice, CoverDevice): diff --git a/homeassistant/components/lutron_caseta/light.py b/homeassistant/components/lutron_caseta/light.py index 53de8b66311ca1..ba4342ecfcef90 100644 --- a/homeassistant/components/lutron_caseta/light.py +++ b/homeassistant/components/lutron_caseta/light.py @@ -25,14 +25,14 @@ def to_hass_level(level): async def async_setup_platform(hass, config, async_add_entities, discovery_info=None): """Set up the Lutron Caseta lights.""" - devs = [] + entities = [] bridge = hass.data[LUTRON_CASETA_SMARTBRIDGE] light_devices = bridge.get_devices_by_domain(DOMAIN) for light_device in light_devices: - dev = LutronCasetaLight(light_device, bridge) - devs.append(dev) + entity = LutronCasetaLight(light_device, bridge) + entities.append(entity) - async_add_entities(devs, True) + async_add_entities(entities, True) class LutronCasetaLight(LutronCasetaDevice, Light): diff --git a/homeassistant/components/lutron_caseta/scene.py b/homeassistant/components/lutron_caseta/scene.py index abdbcaa03cd7c9..593f58f5274df6 100644 --- a/homeassistant/components/lutron_caseta/scene.py +++ b/homeassistant/components/lutron_caseta/scene.py @@ -10,14 +10,14 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=None): """Set up the Lutron Caseta lights.""" - devs = [] + entities = [] bridge = hass.data[LUTRON_CASETA_SMARTBRIDGE] scenes = bridge.get_scenes() for scene in scenes: - dev = LutronCasetaScene(scenes[scene], bridge) - devs.append(dev) + entity = LutronCasetaScene(scenes[scene], bridge) + entities.append(entity) - async_add_entities(devs, True) + async_add_entities(entities, True) class LutronCasetaScene(Scene): diff --git a/homeassistant/components/lutron_caseta/switch.py b/homeassistant/components/lutron_caseta/switch.py index f6eb846ecfb092..23cd1db8f798e5 100644 --- a/homeassistant/components/lutron_caseta/switch.py +++ b/homeassistant/components/lutron_caseta/switch.py @@ -10,15 +10,15 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=None): """Set up Lutron switch.""" - devs = [] + entities = [] bridge = hass.data[LUTRON_CASETA_SMARTBRIDGE] switch_devices = bridge.get_devices_by_domain(DOMAIN) for switch_device in switch_devices: - dev = LutronCasetaLight(switch_device, bridge) - devs.append(dev) + entity = LutronCasetaLight(switch_device, bridge) + entities.append(entity) - async_add_entities(devs, True) + async_add_entities(entities, True) return True From b289cd42a6a8210fd728576a11f537ab8c0baf00 Mon Sep 17 00:00:00 2001 From: Jason Swails Date: Sun, 22 Mar 2020 08:28:35 -0400 Subject: [PATCH 2/3] black --- homeassistant/components/lutron_caseta/__init__.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/homeassistant/components/lutron_caseta/__init__.py b/homeassistant/components/lutron_caseta/__init__.py index 4d8ecc5d17bcd5..baf5ae9a80d4dd 100644 --- a/homeassistant/components/lutron_caseta/__init__.py +++ b/homeassistant/components/lutron_caseta/__init__.py @@ -81,9 +81,7 @@ def __init__(self, device, bridge): async def async_added_to_hass(self): """Register callbacks.""" - self._smartbridge.add_subscriber( - self.device_id, self.async_update_ha_state - ) + self._smartbridge.add_subscriber(self.device_id, self.async_update_ha_state) @property def device_id(self): From 225edab14d43538e10680acce15b91318bb33cd2 Mon Sep 17 00:00:00 2001 From: Jason Swails Date: Sun, 22 Mar 2020 11:06:36 -0400 Subject: [PATCH 3/3] Update homeassistant/components/lutron_caseta/__init__.py Co-Authored-By: Martin Hjelmare --- homeassistant/components/lutron_caseta/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/lutron_caseta/__init__.py b/homeassistant/components/lutron_caseta/__init__.py index baf5ae9a80d4dd..a3e384fd77bca9 100644 --- a/homeassistant/components/lutron_caseta/__init__.py +++ b/homeassistant/components/lutron_caseta/__init__.py @@ -81,7 +81,7 @@ def __init__(self, device, bridge): async def async_added_to_hass(self): """Register callbacks.""" - self._smartbridge.add_subscriber(self.device_id, self.async_update_ha_state) + self._smartbridge.add_subscriber(self.device_id, self.async_write_ha_state) @property def device_id(self):