From c2ed743237b3a4adf4cc2aaeeff4f4285a9c9462 Mon Sep 17 00:00:00 2001 From: Robert Svensson Date: Thu, 1 Oct 2020 19:06:20 +0200 Subject: [PATCH] Improve deCONZ platforms (#40986) * Use platform domain imports with the list of supported platforms * Remove legacy async_setup_platform from platforms --- .../components/deconz/binary_sensor.py | 4 --- homeassistant/components/deconz/climate.py | 4 --- homeassistant/components/deconz/const.py | 25 +++++++++++++------ homeassistant/components/deconz/cover.py | 4 --- homeassistant/components/deconz/light.py | 4 --- homeassistant/components/deconz/scene.py | 4 --- homeassistant/components/deconz/sensor.py | 4 --- homeassistant/components/deconz/switch.py | 4 --- 8 files changed, 17 insertions(+), 36 deletions(-) diff --git a/homeassistant/components/deconz/binary_sensor.py b/homeassistant/components/deconz/binary_sensor.py index f7a9c1a5217..5dc11d9b580 100644 --- a/homeassistant/components/deconz/binary_sensor.py +++ b/homeassistant/components/deconz/binary_sensor.py @@ -33,10 +33,6 @@ DEVICE_CLASS = { } -async def async_setup_platform(hass, config, async_add_entities, discovery_info=None): - """Old way of setting up deCONZ platforms.""" - - async def async_setup_entry(hass, config_entry, async_add_entities): """Set up the deCONZ binary sensor.""" gateway = get_gateway_from_config_entry(hass, config_entry) diff --git a/homeassistant/components/deconz/climate.py b/homeassistant/components/deconz/climate.py index 10ea7173f8a..7cfb716b586 100644 --- a/homeassistant/components/deconz/climate.py +++ b/homeassistant/components/deconz/climate.py @@ -19,10 +19,6 @@ from .gateway import get_gateway_from_config_entry SUPPORT_HVAC = [HVAC_MODE_AUTO, HVAC_MODE_HEAT, HVAC_MODE_OFF] -async def async_setup_platform(hass, config, async_add_entities, discovery_info=None): - """Old way of setting up deCONZ platforms.""" - - async def async_setup_entry(hass, config_entry, async_add_entities): """Set up the deCONZ climate devices. diff --git a/homeassistant/components/deconz/const.py b/homeassistant/components/deconz/const.py index f60c4c35646..d965b6485f8 100644 --- a/homeassistant/components/deconz/const.py +++ b/homeassistant/components/deconz/const.py @@ -1,6 +1,15 @@ """Constants for the deCONZ component.""" import logging +from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN +from homeassistant.components.climate import DOMAIN as CLIMATE_DOMAIN +from homeassistant.components.cover import DOMAIN as COVER_DOMAIN +from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN +from homeassistant.components.lock import DOMAIN as LOCK_DOMAIN +from homeassistant.components.scene import DOMAIN as SCENE_DOMAIN +from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN +from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN + LOGGER = logging.getLogger(__package__) DOMAIN = "deconz" @@ -19,14 +28,14 @@ CONF_ALLOW_NEW_DEVICES = "allow_new_devices" CONF_MASTER_GATEWAY = "master" SUPPORTED_PLATFORMS = [ - "binary_sensor", - "climate", - "cover", - "light", - "lock", - "scene", - "sensor", - "switch", + BINARY_SENSOR_DOMAIN, + CLIMATE_DOMAIN, + COVER_DOMAIN, + LIGHT_DOMAIN, + LOCK_DOMAIN, + SCENE_DOMAIN, + SENSOR_DOMAIN, + SWITCH_DOMAIN, ] NEW_GROUP = "groups" diff --git a/homeassistant/components/deconz/cover.py b/homeassistant/components/deconz/cover.py index 7bcd821a344..d1cd48c47cc 100644 --- a/homeassistant/components/deconz/cover.py +++ b/homeassistant/components/deconz/cover.py @@ -17,10 +17,6 @@ from .deconz_device import DeconzDevice from .gateway import get_gateway_from_config_entry -async def async_setup_platform(hass, config, async_add_entities, discovery_info=None): - """Old way of setting up deCONZ platforms.""" - - async def async_setup_entry(hass, config_entry, async_add_entities): """Set up covers for deCONZ component. diff --git a/homeassistant/components/deconz/light.py b/homeassistant/components/deconz/light.py index 544699970f2..cf7007109b3 100644 --- a/homeassistant/components/deconz/light.py +++ b/homeassistant/components/deconz/light.py @@ -35,10 +35,6 @@ from .deconz_device import DeconzDevice from .gateway import get_gateway_from_config_entry -async def async_setup_platform(hass, config, async_add_entities, discovery_info=None): - """Old way of setting up deCONZ platforms.""" - - async def async_setup_entry(hass, config_entry, async_add_entities): """Set up the deCONZ lights and groups from a config entry.""" gateway = get_gateway_from_config_entry(hass, config_entry) diff --git a/homeassistant/components/deconz/scene.py b/homeassistant/components/deconz/scene.py index fdeb1d43acc..2ce3da6c234 100644 --- a/homeassistant/components/deconz/scene.py +++ b/homeassistant/components/deconz/scene.py @@ -9,10 +9,6 @@ from .const import NEW_SCENE from .gateway import get_gateway_from_config_entry -async def async_setup_platform(hass, config, async_add_entities, discovery_info=None): - """Old way of setting up deCONZ platforms.""" - - async def async_setup_entry(hass, config_entry, async_add_entities): """Set up scenes for deCONZ component.""" gateway = get_gateway_from_config_entry(hass, config_entry) diff --git a/homeassistant/components/deconz/sensor.py b/homeassistant/components/deconz/sensor.py index 08e81d2dd3b..32dc0ee7ea3 100644 --- a/homeassistant/components/deconz/sensor.py +++ b/homeassistant/components/deconz/sensor.py @@ -68,10 +68,6 @@ UNIT_OF_MEASUREMENT = { } -async def async_setup_platform(hass, config, async_add_entities, discovery_info=None): - """Old way of setting up deCONZ platforms.""" - - async def async_setup_entry(hass, config_entry, async_add_entities): """Set up the deCONZ sensors.""" gateway = get_gateway_from_config_entry(hass, config_entry) diff --git a/homeassistant/components/deconz/switch.py b/homeassistant/components/deconz/switch.py index dacae4d4a56..af543348a4d 100644 --- a/homeassistant/components/deconz/switch.py +++ b/homeassistant/components/deconz/switch.py @@ -8,10 +8,6 @@ from .deconz_device import DeconzDevice from .gateway import get_gateway_from_config_entry -async def async_setup_platform(hass, config, async_add_entities, discovery_info=None): - """Old way of setting up deCONZ platforms.""" - - async def async_setup_entry(hass, config_entry, async_add_entities): """Set up switches for deCONZ component.