diff --git a/homeassistant/components/abode/__init__.py b/homeassistant/components/abode/__init__.py index 20c0624742c..47e03eea44c 100644 --- a/homeassistant/components/abode/__init__.py +++ b/homeassistant/components/abode/__init__.py @@ -66,7 +66,7 @@ CAPTURE_IMAGE_SCHEMA = vol.Schema({ATTR_ENTITY_ID: cv.entity_ids}) AUTOMATION_SCHEMA = vol.Schema({ATTR_ENTITY_ID: cv.entity_ids}) -ABODE_PLATFORMS = [ +PLATFORMS = [ "alarm_control_panel", "binary_sensor", "lock", @@ -138,7 +138,7 @@ async def async_setup_entry(hass, config_entry): hass.data[DOMAIN] = AbodeSystem(abode, polling) - for platform in ABODE_PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( hass.config_entries.async_forward_entry_setup(config_entry, platform) ) @@ -158,7 +158,7 @@ async def async_unload_entry(hass, config_entry): tasks = [] - for platform in ABODE_PLATFORMS: + for platform in PLATFORMS: tasks.append( hass.config_entries.async_forward_entry_unload(config_entry, platform) ) diff --git a/homeassistant/components/accuweather/__init__.py b/homeassistant/components/accuweather/__init__.py index 27dbae7a41f..b2ec7e0224b 100644 --- a/homeassistant/components/accuweather/__init__.py +++ b/homeassistant/components/accuweather/__init__.py @@ -57,9 +57,9 @@ async def async_setup_entry(hass, config_entry) -> bool: UNDO_UPDATE_LISTENER: undo_listener, } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) return True @@ -70,8 +70,8 @@ async def async_unload_entry(hass, config_entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/acmeda/__init__.py b/homeassistant/components/acmeda/__init__.py index 3b4f135a6fd..ede6751a6fe 100644 --- a/homeassistant/components/acmeda/__init__.py +++ b/homeassistant/components/acmeda/__init__.py @@ -28,9 +28,9 @@ async def async_setup_entry( hass.data.setdefault(DOMAIN, {}) hass.data[DOMAIN][config_entry.entry_id] = hub - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) return True @@ -45,8 +45,8 @@ async def async_unload_entry( unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/adguard/__init__.py b/homeassistant/components/adguard/__init__.py index 71dff2ab6ee..0a316784f8b 100644 --- a/homeassistant/components/adguard/__init__.py +++ b/homeassistant/components/adguard/__init__.py @@ -43,6 +43,8 @@ SERVICE_REFRESH_SCHEMA = vol.Schema( {vol.Optional(CONF_FORCE, default=False): cv.boolean} ) +PLATFORMS = ["sensor", "switch"] + async def async_setup(hass: HomeAssistantType, config: ConfigType) -> bool: """Set up the AdGuard Home components.""" @@ -69,9 +71,9 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool except AdGuardHomeConnectionError as exception: raise ConfigEntryNotReady from exception - for component in "sensor", "switch": + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) async def add_url(call) -> None: @@ -123,8 +125,8 @@ async def async_unload_entry(hass: HomeAssistantType, entry: ConfigType) -> bool hass.services.async_remove(DOMAIN, SERVICE_DISABLE_URL) hass.services.async_remove(DOMAIN, SERVICE_REFRESH) - for component in "sensor", "switch": - await hass.config_entries.async_forward_entry_unload(entry, component) + for platform in PLATFORMS: + await hass.config_entries.async_forward_entry_unload(entry, platform) del hass.data[DOMAIN] diff --git a/homeassistant/components/advantage_air/__init__.py b/homeassistant/components/advantage_air/__init__.py index 7b270f1f335..d98e991364d 100644 --- a/homeassistant/components/advantage_air/__init__.py +++ b/homeassistant/components/advantage_air/__init__.py @@ -14,7 +14,7 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda from .const import ADVANTAGE_AIR_RETRY, DOMAIN ADVANTAGE_AIR_SYNC_INTERVAL = 15 -ADVANTAGE_AIR_PLATFORMS = ["climate", "cover", "binary_sensor", "sensor", "switch"] +PLATFORMS = ["climate", "cover", "binary_sensor", "sensor", "switch"] _LOGGER = logging.getLogger(__name__) @@ -67,7 +67,7 @@ async def async_setup_entry(hass, entry): "async_change": async_change, } - for platform in ADVANTAGE_AIR_PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( hass.config_entries.async_forward_entry_setup(entry, platform) ) @@ -80,8 +80,8 @@ async def async_unload_entry(hass, entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in ADVANTAGE_AIR_PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/aemet/__init__.py b/homeassistant/components/aemet/__init__.py index 58b1a3b10f0..54c93f43a25 100644 --- a/homeassistant/components/aemet/__init__.py +++ b/homeassistant/components/aemet/__init__.py @@ -8,7 +8,7 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME from homeassistant.core import HomeAssistant -from .const import COMPONENTS, DOMAIN, ENTRY_NAME, ENTRY_WEATHER_COORDINATOR +from .const import DOMAIN, ENTRY_NAME, ENTRY_WEATHER_COORDINATOR, PLATFORMS from .weather_update_coordinator import WeatherUpdateCoordinator _LOGGER = logging.getLogger(__name__) @@ -37,9 +37,9 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry): ENTRY_WEATHER_COORDINATOR: weather_coordinator, } - for component in COMPONENTS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) return True @@ -50,8 +50,8 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in COMPONENTS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/aemet/const.py b/homeassistant/components/aemet/const.py index 13b9d944bf0..390ccb86003 100644 --- a/homeassistant/components/aemet/const.py +++ b/homeassistant/components/aemet/const.py @@ -34,7 +34,7 @@ from homeassistant.const import ( ) ATTRIBUTION = "Powered by AEMET OpenData" -COMPONENTS = ["sensor", "weather"] +PLATFORMS = ["sensor", "weather"] DEFAULT_NAME = "AEMET" DOMAIN = "aemet" ENTRY_NAME = "name" diff --git a/homeassistant/components/airly/__init__.py b/homeassistant/components/airly/__init__.py index fd1defc64f6..ff7a87f92fc 100644 --- a/homeassistant/components/airly/__init__.py +++ b/homeassistant/components/airly/__init__.py @@ -79,9 +79,9 @@ async def async_setup_entry(hass, config_entry): hass.data.setdefault(DOMAIN, {}) hass.data[DOMAIN][config_entry.entry_id] = coordinator - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) return True @@ -92,8 +92,8 @@ async def async_unload_entry(hass, config_entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/airnow/__init__.py b/homeassistant/components/airnow/__init__.py index 5cbc87947f9..1732445c566 100644 --- a/homeassistant/components/airnow/__init__.py +++ b/homeassistant/components/airnow/__init__.py @@ -68,9 +68,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): hass.data.setdefault(DOMAIN, {}) hass.data[DOMAIN][entry.entry_id] = coordinator - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -81,8 +81,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/airvisual/__init__.py b/homeassistant/components/airvisual/__init__.py index 3a88243b0b9..c04f56f6b09 100644 --- a/homeassistant/components/airvisual/__init__.py +++ b/homeassistant/components/airvisual/__init__.py @@ -268,9 +268,9 @@ async def async_setup_entry(hass, config_entry): hass.data[DOMAIN][DATA_COORDINATOR][config_entry.entry_id] = coordinator - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) return True @@ -323,8 +323,8 @@ async def async_unload_entry(hass, config_entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/alarmdecoder/__init__.py b/homeassistant/components/alarmdecoder/__init__.py index 8dd704f1333..34493b3b9d0 100644 --- a/homeassistant/components/alarmdecoder/__init__.py +++ b/homeassistant/components/alarmdecoder/__init__.py @@ -130,9 +130,9 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool await open_connection() - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -144,8 +144,8 @@ async def async_unload_entry(hass: HomeAssistantType, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/ambient_station/__init__.py b/homeassistant/components/ambient_station/__init__.py index 4a5558c5963..b4ac6992459 100644 --- a/homeassistant/components/ambient_station/__init__.py +++ b/homeassistant/components/ambient_station/__init__.py @@ -5,7 +5,11 @@ from aioambient import Client from aioambient.errors import WebsocketError import voluptuous as vol -from homeassistant.components.binary_sensor import DEVICE_CLASS_CONNECTIVITY +from homeassistant.components.binary_sensor import ( + DEVICE_CLASS_CONNECTIVITY, + DOMAIN as BINARY_SENSOR, +) +from homeassistant.components.sensor import DOMAIN as SENSOR from homeassistant.config_entries import SOURCE_IMPORT from homeassistant.const import ( ATTR_LOCATION, @@ -39,10 +43,10 @@ from .const import ( DATA_CLIENT, DOMAIN, LOGGER, - TYPE_BINARY_SENSOR, - TYPE_SENSOR, ) +PLATFORMS = [BINARY_SENSOR, SENSOR] + DATA_CONFIG = "config" DEFAULT_SOCKET_MIN_RETRY = 15 @@ -141,109 +145,109 @@ TYPE_WINDSPDMPH_AVG2M = "windspdmph_avg2m" TYPE_WINDSPEEDMPH = "windspeedmph" TYPE_YEARLYRAININ = "yearlyrainin" SENSOR_TYPES = { - TYPE_24HOURRAININ: ("24 Hr Rain", "in", TYPE_SENSOR, None), - TYPE_BAROMABSIN: ("Abs Pressure", PRESSURE_INHG, TYPE_SENSOR, "pressure"), - TYPE_BAROMRELIN: ("Rel Pressure", PRESSURE_INHG, TYPE_SENSOR, "pressure"), - TYPE_BATT10: ("Battery 10", None, TYPE_BINARY_SENSOR, "battery"), - TYPE_BATT1: ("Battery 1", None, TYPE_BINARY_SENSOR, "battery"), - TYPE_BATT2: ("Battery 2", None, TYPE_BINARY_SENSOR, "battery"), - TYPE_BATT3: ("Battery 3", None, TYPE_BINARY_SENSOR, "battery"), - TYPE_BATT4: ("Battery 4", None, TYPE_BINARY_SENSOR, "battery"), - TYPE_BATT5: ("Battery 5", None, TYPE_BINARY_SENSOR, "battery"), - TYPE_BATT6: ("Battery 6", None, TYPE_BINARY_SENSOR, "battery"), - TYPE_BATT7: ("Battery 7", None, TYPE_BINARY_SENSOR, "battery"), - TYPE_BATT8: ("Battery 8", None, TYPE_BINARY_SENSOR, "battery"), - TYPE_BATT9: ("Battery 9", None, TYPE_BINARY_SENSOR, "battery"), - TYPE_BATTOUT: ("Battery", None, TYPE_BINARY_SENSOR, "battery"), - TYPE_CO2: ("co2", CONCENTRATION_PARTS_PER_MILLION, TYPE_SENSOR, None), - TYPE_DAILYRAININ: ("Daily Rain", "in", TYPE_SENSOR, None), - TYPE_DEWPOINT: ("Dew Point", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_EVENTRAININ: ("Event Rain", "in", TYPE_SENSOR, None), - TYPE_FEELSLIKE: ("Feels Like", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_HOURLYRAININ: ("Hourly Rain Rate", "in/hr", TYPE_SENSOR, None), - TYPE_HUMIDITY10: ("Humidity 10", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_HUMIDITY1: ("Humidity 1", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_HUMIDITY2: ("Humidity 2", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_HUMIDITY3: ("Humidity 3", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_HUMIDITY4: ("Humidity 4", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_HUMIDITY5: ("Humidity 5", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_HUMIDITY6: ("Humidity 6", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_HUMIDITY7: ("Humidity 7", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_HUMIDITY8: ("Humidity 8", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_HUMIDITY9: ("Humidity 9", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_HUMIDITY: ("Humidity", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_HUMIDITYIN: ("Humidity In", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_LASTRAIN: ("Last Rain", None, TYPE_SENSOR, "timestamp"), - TYPE_MAXDAILYGUST: ("Max Gust", SPEED_MILES_PER_HOUR, TYPE_SENSOR, None), - TYPE_MONTHLYRAININ: ("Monthly Rain", "in", TYPE_SENSOR, None), - TYPE_RELAY10: ("Relay 10", None, TYPE_BINARY_SENSOR, DEVICE_CLASS_CONNECTIVITY), - TYPE_RELAY1: ("Relay 1", None, TYPE_BINARY_SENSOR, DEVICE_CLASS_CONNECTIVITY), - TYPE_RELAY2: ("Relay 2", None, TYPE_BINARY_SENSOR, DEVICE_CLASS_CONNECTIVITY), - TYPE_RELAY3: ("Relay 3", None, TYPE_BINARY_SENSOR, DEVICE_CLASS_CONNECTIVITY), - TYPE_RELAY4: ("Relay 4", None, TYPE_BINARY_SENSOR, DEVICE_CLASS_CONNECTIVITY), - TYPE_RELAY5: ("Relay 5", None, TYPE_BINARY_SENSOR, DEVICE_CLASS_CONNECTIVITY), - TYPE_RELAY6: ("Relay 6", None, TYPE_BINARY_SENSOR, DEVICE_CLASS_CONNECTIVITY), - TYPE_RELAY7: ("Relay 7", None, TYPE_BINARY_SENSOR, DEVICE_CLASS_CONNECTIVITY), - TYPE_RELAY8: ("Relay 8", None, TYPE_BINARY_SENSOR, DEVICE_CLASS_CONNECTIVITY), - TYPE_RELAY9: ("Relay 9", None, TYPE_BINARY_SENSOR, DEVICE_CLASS_CONNECTIVITY), - TYPE_SOILHUM10: ("Soil Humidity 10", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_SOILHUM1: ("Soil Humidity 1", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_SOILHUM2: ("Soil Humidity 2", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_SOILHUM3: ("Soil Humidity 3", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_SOILHUM4: ("Soil Humidity 4", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_SOILHUM5: ("Soil Humidity 5", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_SOILHUM6: ("Soil Humidity 6", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_SOILHUM7: ("Soil Humidity 7", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_SOILHUM8: ("Soil Humidity 8", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_SOILHUM9: ("Soil Humidity 9", PERCENTAGE, TYPE_SENSOR, "humidity"), - TYPE_SOILTEMP10F: ("Soil Temp 10", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_SOILTEMP1F: ("Soil Temp 1", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_SOILTEMP2F: ("Soil Temp 2", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_SOILTEMP3F: ("Soil Temp 3", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_SOILTEMP4F: ("Soil Temp 4", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_SOILTEMP5F: ("Soil Temp 5", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_SOILTEMP6F: ("Soil Temp 6", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_SOILTEMP7F: ("Soil Temp 7", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_SOILTEMP8F: ("Soil Temp 8", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_SOILTEMP9F: ("Soil Temp 9", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), + TYPE_24HOURRAININ: ("24 Hr Rain", "in", SENSOR, None), + TYPE_BAROMABSIN: ("Abs Pressure", PRESSURE_INHG, SENSOR, "pressure"), + TYPE_BAROMRELIN: ("Rel Pressure", PRESSURE_INHG, SENSOR, "pressure"), + TYPE_BATT10: ("Battery 10", None, BINARY_SENSOR, "battery"), + TYPE_BATT1: ("Battery 1", None, BINARY_SENSOR, "battery"), + TYPE_BATT2: ("Battery 2", None, BINARY_SENSOR, "battery"), + TYPE_BATT3: ("Battery 3", None, BINARY_SENSOR, "battery"), + TYPE_BATT4: ("Battery 4", None, BINARY_SENSOR, "battery"), + TYPE_BATT5: ("Battery 5", None, BINARY_SENSOR, "battery"), + TYPE_BATT6: ("Battery 6", None, BINARY_SENSOR, "battery"), + TYPE_BATT7: ("Battery 7", None, BINARY_SENSOR, "battery"), + TYPE_BATT8: ("Battery 8", None, BINARY_SENSOR, "battery"), + TYPE_BATT9: ("Battery 9", None, BINARY_SENSOR, "battery"), + TYPE_BATTOUT: ("Battery", None, BINARY_SENSOR, "battery"), + TYPE_CO2: ("co2", CONCENTRATION_PARTS_PER_MILLION, SENSOR, None), + TYPE_DAILYRAININ: ("Daily Rain", "in", SENSOR, None), + TYPE_DEWPOINT: ("Dew Point", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_EVENTRAININ: ("Event Rain", "in", SENSOR, None), + TYPE_FEELSLIKE: ("Feels Like", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_HOURLYRAININ: ("Hourly Rain Rate", "in/hr", SENSOR, None), + TYPE_HUMIDITY10: ("Humidity 10", PERCENTAGE, SENSOR, "humidity"), + TYPE_HUMIDITY1: ("Humidity 1", PERCENTAGE, SENSOR, "humidity"), + TYPE_HUMIDITY2: ("Humidity 2", PERCENTAGE, SENSOR, "humidity"), + TYPE_HUMIDITY3: ("Humidity 3", PERCENTAGE, SENSOR, "humidity"), + TYPE_HUMIDITY4: ("Humidity 4", PERCENTAGE, SENSOR, "humidity"), + TYPE_HUMIDITY5: ("Humidity 5", PERCENTAGE, SENSOR, "humidity"), + TYPE_HUMIDITY6: ("Humidity 6", PERCENTAGE, SENSOR, "humidity"), + TYPE_HUMIDITY7: ("Humidity 7", PERCENTAGE, SENSOR, "humidity"), + TYPE_HUMIDITY8: ("Humidity 8", PERCENTAGE, SENSOR, "humidity"), + TYPE_HUMIDITY9: ("Humidity 9", PERCENTAGE, SENSOR, "humidity"), + TYPE_HUMIDITY: ("Humidity", PERCENTAGE, SENSOR, "humidity"), + TYPE_HUMIDITYIN: ("Humidity In", PERCENTAGE, SENSOR, "humidity"), + TYPE_LASTRAIN: ("Last Rain", None, SENSOR, "timestamp"), + TYPE_MAXDAILYGUST: ("Max Gust", SPEED_MILES_PER_HOUR, SENSOR, None), + TYPE_MONTHLYRAININ: ("Monthly Rain", "in", SENSOR, None), + TYPE_RELAY10: ("Relay 10", None, BINARY_SENSOR, DEVICE_CLASS_CONNECTIVITY), + TYPE_RELAY1: ("Relay 1", None, BINARY_SENSOR, DEVICE_CLASS_CONNECTIVITY), + TYPE_RELAY2: ("Relay 2", None, BINARY_SENSOR, DEVICE_CLASS_CONNECTIVITY), + TYPE_RELAY3: ("Relay 3", None, BINARY_SENSOR, DEVICE_CLASS_CONNECTIVITY), + TYPE_RELAY4: ("Relay 4", None, BINARY_SENSOR, DEVICE_CLASS_CONNECTIVITY), + TYPE_RELAY5: ("Relay 5", None, BINARY_SENSOR, DEVICE_CLASS_CONNECTIVITY), + TYPE_RELAY6: ("Relay 6", None, BINARY_SENSOR, DEVICE_CLASS_CONNECTIVITY), + TYPE_RELAY7: ("Relay 7", None, BINARY_SENSOR, DEVICE_CLASS_CONNECTIVITY), + TYPE_RELAY8: ("Relay 8", None, BINARY_SENSOR, DEVICE_CLASS_CONNECTIVITY), + TYPE_RELAY9: ("Relay 9", None, BINARY_SENSOR, DEVICE_CLASS_CONNECTIVITY), + TYPE_SOILHUM10: ("Soil Humidity 10", PERCENTAGE, SENSOR, "humidity"), + TYPE_SOILHUM1: ("Soil Humidity 1", PERCENTAGE, SENSOR, "humidity"), + TYPE_SOILHUM2: ("Soil Humidity 2", PERCENTAGE, SENSOR, "humidity"), + TYPE_SOILHUM3: ("Soil Humidity 3", PERCENTAGE, SENSOR, "humidity"), + TYPE_SOILHUM4: ("Soil Humidity 4", PERCENTAGE, SENSOR, "humidity"), + TYPE_SOILHUM5: ("Soil Humidity 5", PERCENTAGE, SENSOR, "humidity"), + TYPE_SOILHUM6: ("Soil Humidity 6", PERCENTAGE, SENSOR, "humidity"), + TYPE_SOILHUM7: ("Soil Humidity 7", PERCENTAGE, SENSOR, "humidity"), + TYPE_SOILHUM8: ("Soil Humidity 8", PERCENTAGE, SENSOR, "humidity"), + TYPE_SOILHUM9: ("Soil Humidity 9", PERCENTAGE, SENSOR, "humidity"), + TYPE_SOILTEMP10F: ("Soil Temp 10", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_SOILTEMP1F: ("Soil Temp 1", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_SOILTEMP2F: ("Soil Temp 2", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_SOILTEMP3F: ("Soil Temp 3", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_SOILTEMP4F: ("Soil Temp 4", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_SOILTEMP5F: ("Soil Temp 5", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_SOILTEMP6F: ("Soil Temp 6", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_SOILTEMP7F: ("Soil Temp 7", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_SOILTEMP8F: ("Soil Temp 8", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_SOILTEMP9F: ("Soil Temp 9", TEMP_FAHRENHEIT, SENSOR, "temperature"), TYPE_SOLARRADIATION: ( "Solar Rad", IRRADIATION_WATTS_PER_SQUARE_METER, - TYPE_SENSOR, + SENSOR, None, ), - TYPE_SOLARRADIATION_LX: ("Solar Rad (lx)", LIGHT_LUX, TYPE_SENSOR, "illuminance"), - TYPE_TEMP10F: ("Temp 10", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_TEMP1F: ("Temp 1", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_TEMP2F: ("Temp 2", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_TEMP3F: ("Temp 3", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_TEMP4F: ("Temp 4", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_TEMP5F: ("Temp 5", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_TEMP6F: ("Temp 6", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_TEMP7F: ("Temp 7", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_TEMP8F: ("Temp 8", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_TEMP9F: ("Temp 9", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_TEMPF: ("Temp", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_TEMPINF: ("Inside Temp", TEMP_FAHRENHEIT, TYPE_SENSOR, "temperature"), - TYPE_TOTALRAININ: ("Lifetime Rain", "in", TYPE_SENSOR, None), - TYPE_UV: ("uv", "Index", TYPE_SENSOR, None), - TYPE_PM25: ("PM25", CONCENTRATION_MICROGRAMS_PER_CUBIC_METER, TYPE_SENSOR, None), + TYPE_SOLARRADIATION_LX: ("Solar Rad (lx)", LIGHT_LUX, SENSOR, "illuminance"), + TYPE_TEMP10F: ("Temp 10", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_TEMP1F: ("Temp 1", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_TEMP2F: ("Temp 2", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_TEMP3F: ("Temp 3", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_TEMP4F: ("Temp 4", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_TEMP5F: ("Temp 5", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_TEMP6F: ("Temp 6", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_TEMP7F: ("Temp 7", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_TEMP8F: ("Temp 8", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_TEMP9F: ("Temp 9", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_TEMPF: ("Temp", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_TEMPINF: ("Inside Temp", TEMP_FAHRENHEIT, SENSOR, "temperature"), + TYPE_TOTALRAININ: ("Lifetime Rain", "in", SENSOR, None), + TYPE_UV: ("uv", "Index", SENSOR, None), + TYPE_PM25: ("PM25", CONCENTRATION_MICROGRAMS_PER_CUBIC_METER, SENSOR, None), TYPE_PM25_24H: ( "PM25 24h Avg", CONCENTRATION_MICROGRAMS_PER_CUBIC_METER, - TYPE_SENSOR, + SENSOR, None, ), - TYPE_WEEKLYRAININ: ("Weekly Rain", "in", TYPE_SENSOR, None), - TYPE_WINDDIR: ("Wind Dir", DEGREE, TYPE_SENSOR, None), - TYPE_WINDDIR_AVG10M: ("Wind Dir Avg 10m", DEGREE, TYPE_SENSOR, None), - TYPE_WINDDIR_AVG2M: ("Wind Dir Avg 2m", SPEED_MILES_PER_HOUR, TYPE_SENSOR, None), - TYPE_WINDGUSTDIR: ("Gust Dir", DEGREE, TYPE_SENSOR, None), - TYPE_WINDGUSTMPH: ("Wind Gust", SPEED_MILES_PER_HOUR, TYPE_SENSOR, None), - TYPE_WINDSPDMPH_AVG10M: ("Wind Avg 10m", SPEED_MILES_PER_HOUR, TYPE_SENSOR, None), - TYPE_WINDSPDMPH_AVG2M: ("Wind Avg 2m", SPEED_MILES_PER_HOUR, TYPE_SENSOR, None), - TYPE_WINDSPEEDMPH: ("Wind Speed", SPEED_MILES_PER_HOUR, TYPE_SENSOR, None), - TYPE_YEARLYRAININ: ("Yearly Rain", "in", TYPE_SENSOR, None), + TYPE_WEEKLYRAININ: ("Weekly Rain", "in", SENSOR, None), + TYPE_WINDDIR: ("Wind Dir", DEGREE, SENSOR, None), + TYPE_WINDDIR_AVG10M: ("Wind Dir Avg 10m", DEGREE, SENSOR, None), + TYPE_WINDDIR_AVG2M: ("Wind Dir Avg 2m", SPEED_MILES_PER_HOUR, SENSOR, None), + TYPE_WINDGUSTDIR: ("Gust Dir", DEGREE, SENSOR, None), + TYPE_WINDGUSTMPH: ("Wind Gust", SPEED_MILES_PER_HOUR, SENSOR, None), + TYPE_WINDSPDMPH_AVG10M: ("Wind Avg 10m", SPEED_MILES_PER_HOUR, SENSOR, None), + TYPE_WINDSPDMPH_AVG2M: ("Wind Avg 2m", SPEED_MILES_PER_HOUR, SENSOR, None), + TYPE_WINDSPEEDMPH: ("Wind Speed", SPEED_MILES_PER_HOUR, SENSOR, None), + TYPE_YEARLYRAININ: ("Yearly Rain", "in", SENSOR, None), } CONFIG_SCHEMA = vol.Schema( @@ -260,7 +264,7 @@ CONFIG_SCHEMA = vol.Schema( async def async_setup(hass, config): - """Set up the Ambient PWS component.""" + """Set up the Ambient PWS integration.""" hass.data[DOMAIN] = {} hass.data[DOMAIN][DATA_CLIENT] = {} @@ -322,8 +326,8 @@ async def async_unload_entry(hass, config_entry): hass.async_create_task(ambient.ws_disconnect()) tasks = [ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in ("binary_sensor", "sensor") + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] await asyncio.gather(*tasks) @@ -431,10 +435,10 @@ class AmbientStation: # attempt forward setup of the config entry (because it will have # already been done): if not self._entry_setup_complete: - for component in ("binary_sensor", "sensor"): + for platform in PLATFORMS: self._hass.async_create_task( self._hass.config_entries.async_forward_entry_setup( - self._config_entry, component + self._config_entry, platform ) ) self._entry_setup_complete = True diff --git a/homeassistant/components/ambient_station/binary_sensor.py b/homeassistant/components/ambient_station/binary_sensor.py index 0a3a91e515c..8fdeb862e2e 100644 --- a/homeassistant/components/ambient_station/binary_sensor.py +++ b/homeassistant/components/ambient_station/binary_sensor.py @@ -1,5 +1,8 @@ """Support for Ambient Weather Station binary sensors.""" -from homeassistant.components.binary_sensor import BinarySensorEntity +from homeassistant.components.binary_sensor import ( + DOMAIN as BINARY_SENSOR, + BinarySensorEntity, +) from homeassistant.const import ATTR_NAME from homeassistant.core import callback @@ -18,13 +21,7 @@ from . import ( TYPE_BATTOUT, AmbientWeatherEntity, ) -from .const import ( - ATTR_LAST_DATA, - ATTR_MONITORED_CONDITIONS, - DATA_CLIENT, - DOMAIN, - TYPE_BINARY_SENSOR, -) +from .const import ATTR_LAST_DATA, ATTR_MONITORED_CONDITIONS, DATA_CLIENT, DOMAIN async def async_setup_entry(hass, entry, async_add_entities): @@ -35,7 +32,7 @@ async def async_setup_entry(hass, entry, async_add_entities): for mac_address, station in ambient.stations.items(): for condition in station[ATTR_MONITORED_CONDITIONS]: name, _, kind, device_class = SENSOR_TYPES[condition] - if kind == TYPE_BINARY_SENSOR: + if kind == BINARY_SENSOR: binary_sensor_list.append( AmbientWeatherBinarySensor( ambient, diff --git a/homeassistant/components/ambient_station/const.py b/homeassistant/components/ambient_station/const.py index e59f926eac3..87b5ff61877 100644 --- a/homeassistant/components/ambient_station/const.py +++ b/homeassistant/components/ambient_station/const.py @@ -10,6 +10,3 @@ ATTR_MONITORED_CONDITIONS = "monitored_conditions" CONF_APP_KEY = "app_key" DATA_CLIENT = "data_client" - -TYPE_BINARY_SENSOR = "binary_sensor" -TYPE_SENSOR = "sensor" diff --git a/homeassistant/components/ambient_station/sensor.py b/homeassistant/components/ambient_station/sensor.py index 540e2facd4d..184927a1ef5 100644 --- a/homeassistant/components/ambient_station/sensor.py +++ b/homeassistant/components/ambient_station/sensor.py @@ -1,4 +1,5 @@ """Support for Ambient Weather Station sensors.""" +from homeassistant.components.binary_sensor import DOMAIN as SENSOR from homeassistant.const import ATTR_NAME from homeassistant.core import callback @@ -8,13 +9,7 @@ from . import ( TYPE_SOLARRADIATION_LX, AmbientWeatherEntity, ) -from .const import ( - ATTR_LAST_DATA, - ATTR_MONITORED_CONDITIONS, - DATA_CLIENT, - DOMAIN, - TYPE_SENSOR, -) +from .const import ATTR_LAST_DATA, ATTR_MONITORED_CONDITIONS, DATA_CLIENT, DOMAIN async def async_setup_entry(hass, entry, async_add_entities): @@ -25,7 +20,7 @@ async def async_setup_entry(hass, entry, async_add_entities): for mac_address, station in ambient.stations.items(): for condition in station[ATTR_MONITORED_CONDITIONS]: name, unit, kind, device_class = SENSOR_TYPES[condition] - if kind == TYPE_SENSOR: + if kind == SENSOR: sensor_list.append( AmbientWeatherSensor( ambient, diff --git a/homeassistant/components/apple_tv/__init__.py b/homeassistant/components/apple_tv/__init__.py index b41a107d126..c735ebc57e7 100644 --- a/homeassistant/components/apple_tv/__init__.py +++ b/homeassistant/components/apple_tv/__init__.py @@ -62,8 +62,8 @@ async def async_setup_entry(hass, entry): """Set up platforms and initiate connection.""" await asyncio.gather( *[ - hass.config_entries.async_forward_entry_setup(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_setup(entry, platform) + for platform in PLATFORMS ] ) await manager.init() diff --git a/homeassistant/components/atag/__init__.py b/homeassistant/components/atag/__init__.py index 7489ada3341..c4cffe1c41a 100644 --- a/homeassistant/components/atag/__init__.py +++ b/homeassistant/components/atag/__init__.py @@ -78,8 +78,8 @@ async def async_unload_entry(hass, entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/august/__init__.py b/homeassistant/components/august/__init__.py index 6f16f7d5b31..23419f4df2d 100644 --- a/homeassistant/components/august/__init__.py +++ b/homeassistant/components/august/__init__.py @@ -21,7 +21,6 @@ import homeassistant.helpers.config_validation as cv from .activity import ActivityStream from .const import ( - AUGUST_COMPONENTS, CONF_ACCESS_TOKEN_CACHE_FILE, CONF_INSTALL_ID, CONF_LOGIN_METHOD, @@ -32,6 +31,7 @@ from .const import ( DOMAIN, LOGIN_METHODS, MIN_TIME_BETWEEN_DETAIL_UPDATES, + PLATFORMS, VERIFICATION_CODE_KEY, ) from .exceptions import CannotConnect, InvalidAuth, RequireValidation @@ -137,9 +137,9 @@ async def async_setup_august(hass, config_entry, august_gateway): await hass.data[DOMAIN][entry_id][DATA_AUGUST].async_setup() - for component in AUGUST_COMPONENTS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) return True @@ -209,8 +209,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in AUGUST_COMPONENTS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/august/const.py b/homeassistant/components/august/const.py index a32e187647a..57e0d5a7fb7 100644 --- a/homeassistant/components/august/const.py +++ b/homeassistant/components/august/const.py @@ -43,4 +43,4 @@ ACTIVITY_UPDATE_INTERVAL = timedelta(seconds=10) LOGIN_METHODS = ["phone", "email"] -AUGUST_COMPONENTS = ["camera", "binary_sensor", "lock", "sensor"] +PLATFORMS = ["camera", "binary_sensor", "lock", "sensor"] diff --git a/homeassistant/components/aurora/__init__.py b/homeassistant/components/aurora/__init__.py index a187288e2e4..044b118b030 100644 --- a/homeassistant/components/aurora/__init__.py +++ b/homeassistant/components/aurora/__init__.py @@ -79,9 +79,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): AURORA_API: api, } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -92,8 +92,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/blebox/__init__.py b/homeassistant/components/blebox/__init__.py index 3d3c997596a..e0b5a3c4f5d 100644 --- a/homeassistant/components/blebox/__init__.py +++ b/homeassistant/components/blebox/__init__.py @@ -48,9 +48,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): domain_entry = domain.setdefault(entry.entry_id, {}) product = domain_entry.setdefault(PRODUCT, product) - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True diff --git a/homeassistant/components/blink/__init__.py b/homeassistant/components/blink/__init__.py index 0809018522e..c9c03dc654d 100644 --- a/homeassistant/components/blink/__init__.py +++ b/homeassistant/components/blink/__init__.py @@ -86,9 +86,9 @@ async def async_setup_entry(hass, entry): if not hass.data[DOMAIN][entry.entry_id].available: raise ConfigEntryNotReady - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) def blink_refresh(event_time=None): @@ -133,8 +133,8 @@ async def async_unload_entry(hass, entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/bloomsky/__init__.py b/homeassistant/components/bloomsky/__init__.py index cd993e0332a..76ed9cdd12a 100644 --- a/homeassistant/components/bloomsky/__init__.py +++ b/homeassistant/components/bloomsky/__init__.py @@ -18,7 +18,7 @@ from homeassistant.util import Throttle _LOGGER = logging.getLogger(__name__) -BLOOMSKY_TYPE = ["camera", "binary_sensor", "sensor"] +PLATFORMS = ["camera", "binary_sensor", "sensor"] DOMAIN = "bloomsky" @@ -32,7 +32,7 @@ CONFIG_SCHEMA = vol.Schema( def setup(hass, config): - """Set up the BloomSky component.""" + """Set up the BloomSky integration.""" api_key = config[DOMAIN][CONF_API_KEY] try: @@ -42,8 +42,8 @@ def setup(hass, config): hass.data[DOMAIN] = bloomsky - for component in BLOOMSKY_TYPE: - discovery.load_platform(hass, component, DOMAIN, {}, config) + for platform in PLATFORMS: + discovery.load_platform(hass, platform, DOMAIN, {}, config) return True diff --git a/homeassistant/components/bmw_connected_drive/__init__.py b/homeassistant/components/bmw_connected_drive/__init__.py index a8bebfbc617..3a653ec252f 100644 --- a/homeassistant/components/bmw_connected_drive/__init__.py +++ b/homeassistant/components/bmw_connected_drive/__init__.py @@ -59,7 +59,7 @@ DEFAULT_OPTIONS = { CONF_USE_LOCATION: False, } -BMW_PLATFORMS = ["binary_sensor", "device_tracker", "lock", "notify", "sensor"] +PLATFORMS = ["binary_sensor", "device_tracker", "lock", "notify", "sensor"] UPDATE_INTERVAL = 5 # in minutes SERVICE_UPDATE_STATE = "update_state" @@ -138,13 +138,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): await _async_update_all() - for platform in BMW_PLATFORMS: + for platform in PLATFORMS: if platform != NOTIFY_DOMAIN: hass.async_create_task( hass.config_entries.async_forward_entry_setup(entry, platform) ) - # set up notify platform, no entry support for notify component yet, + # set up notify platform, no entry support for notify platform yet, # have to use discovery to load platform. hass.async_create_task( discovery.async_load_platform( @@ -164,9 +164,9 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in BMW_PLATFORMS - if component != NOTIFY_DOMAIN + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS + if platform != NOTIFY_DOMAIN ] ) ) diff --git a/homeassistant/components/bond/__init__.py b/homeassistant/components/bond/__init__.py index ae9cc2111a2..9ec0c662b8e 100644 --- a/homeassistant/components/bond/__init__.py +++ b/homeassistant/components/bond/__init__.py @@ -65,9 +65,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: _async_remove_old_device_identifiers(config_entry_id, device_registry, hub) - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -78,8 +78,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/braviatv/__init__.py b/homeassistant/components/braviatv/__init__.py index 46fd8675358..95debd9170d 100644 --- a/homeassistant/components/braviatv/__init__.py +++ b/homeassistant/components/braviatv/__init__.py @@ -28,9 +28,9 @@ async def async_setup_entry(hass, config_entry): UNDO_UPDATE_LISTENER: undo_listener, } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) return True @@ -41,8 +41,8 @@ async def async_unload_entry(hass, config_entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/brother/__init__.py b/homeassistant/components/brother/__init__.py index d7cf906a87c..9cddf0efdd5 100644 --- a/homeassistant/components/brother/__init__.py +++ b/homeassistant/components/brother/__init__.py @@ -46,9 +46,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): hass.data[DOMAIN][DATA_CONFIG_ENTRY][entry.entry_id] = coordinator hass.data[DOMAIN][SNMP] = snmp_engine - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -59,8 +59,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/canary/__init__.py b/homeassistant/components/canary/__init__.py index 64f2d00735e..b3fcf6e8641 100644 --- a/homeassistant/components/canary/__init__.py +++ b/homeassistant/components/canary/__init__.py @@ -107,9 +107,9 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool DATA_UNDO_UPDATE_LISTENER: undo_listener, } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -120,8 +120,8 @@ async def async_unload_entry(hass: HomeAssistantType, entry: ConfigEntry) -> boo unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/climacell/__init__.py b/homeassistant/components/climacell/__init__.py index d6bf0ec4e12..6f1ac730f2f 100644 --- a/homeassistant/components/climacell/__init__.py +++ b/homeassistant/components/climacell/__init__.py @@ -117,9 +117,9 @@ async def async_setup_entry(hass: HomeAssistantType, config_entry: ConfigEntry) hass.data[DOMAIN][config_entry.entry_id] = coordinator - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) return True @@ -132,8 +132,8 @@ async def async_unload_entry( unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/control4/__init__.py b/homeassistant/components/control4/__init__.py index a45cdc4006a..7f8ec09cdde 100644 --- a/homeassistant/components/control4/__init__.py +++ b/homeassistant/components/control4/__init__.py @@ -115,9 +115,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): entry_data[CONF_CONFIG_LISTENER] = entry.add_update_listener(update_listener) - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -134,8 +134,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/coronavirus/__init__.py b/homeassistant/components/coronavirus/__init__.py index fa8efebe154..d05c4cef862 100644 --- a/homeassistant/components/coronavirus/__init__.py +++ b/homeassistant/components/coronavirus/__init__.py @@ -44,9 +44,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): if not entry.unique_id: hass.config_entries.async_update_entry(entry, unique_id=entry.data["country"]) - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -57,8 +57,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/daikin/__init__.py b/homeassistant/components/daikin/__init__.py index 16fd2b2ff56..d0bc109c082 100644 --- a/homeassistant/components/daikin/__init__.py +++ b/homeassistant/components/daikin/__init__.py @@ -25,7 +25,7 @@ DOMAIN = "daikin" PARALLEL_UPDATES = 0 MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=60) -COMPONENT_TYPES = ["climate", "sensor", "switch"] +PLATFORMS = ["climate", "sensor", "switch"] CONFIG_SCHEMA = vol.Schema( vol.All( @@ -83,9 +83,9 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry): if not daikin_api: return False hass.data.setdefault(DOMAIN, {}).update({entry.entry_id: daikin_api}) - for component in COMPONENT_TYPES: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -94,8 +94,8 @@ async def async_unload_entry(hass, config_entry): """Unload a config entry.""" await asyncio.wait( [ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in COMPONENT_TYPES + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) hass.data[DOMAIN].pop(config_entry.entry_id) diff --git a/homeassistant/components/danfoss_air/__init__.py b/homeassistant/components/danfoss_air/__init__.py index b1dbf890eb9..18780c10310 100644 --- a/homeassistant/components/danfoss_air/__init__.py +++ b/homeassistant/components/danfoss_air/__init__.py @@ -13,7 +13,7 @@ from homeassistant.util import Throttle _LOGGER = logging.getLogger(__name__) -DANFOSS_AIR_PLATFORMS = ["sensor", "binary_sensor", "switch"] +PLATFORMS = ["sensor", "binary_sensor", "switch"] DOMAIN = "danfoss_air" MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=60) @@ -29,7 +29,7 @@ def setup(hass, config): hass.data[DOMAIN] = DanfossAir(conf[CONF_HOST]) - for platform in DANFOSS_AIR_PLATFORMS: + for platform in PLATFORMS: discovery.load_platform(hass, platform, DOMAIN, {}, config) return True diff --git a/homeassistant/components/deconz/const.py b/homeassistant/components/deconz/const.py index 67effa4e81b..64667a9e616 100644 --- a/homeassistant/components/deconz/const.py +++ b/homeassistant/components/deconz/const.py @@ -28,7 +28,7 @@ CONF_ALLOW_DECONZ_GROUPS = "allow_deconz_groups" CONF_ALLOW_NEW_DEVICES = "allow_new_devices" CONF_MASTER_GATEWAY = "master" -SUPPORTED_PLATFORMS = [ +PLATFORMS = [ BINARY_SENSOR_DOMAIN, CLIMATE_DOMAIN, COVER_DOMAIN, diff --git a/homeassistant/components/deconz/gateway.py b/homeassistant/components/deconz/gateway.py index a6cbb2acef9..2b38f6956be 100644 --- a/homeassistant/components/deconz/gateway.py +++ b/homeassistant/components/deconz/gateway.py @@ -26,7 +26,7 @@ from .const import ( NEW_LIGHT, NEW_SCENE, NEW_SENSOR, - SUPPORTED_PLATFORMS, + PLATFORMS, ) from .deconz_event import async_setup_events, async_unload_events from .errors import AuthenticationRequired, CannotConnect @@ -184,10 +184,10 @@ class DeconzGateway: ) return False - for component in SUPPORTED_PLATFORMS: + for platform in PLATFORMS: self.hass.async_create_task( self.hass.config_entries.async_forward_entry_setup( - self.config_entry, component + self.config_entry, platform ) ) @@ -259,9 +259,9 @@ class DeconzGateway: self.api.async_connection_status_callback = None self.api.close() - for component in SUPPORTED_PLATFORMS: + for platform in PLATFORMS: await self.hass.config_entries.async_forward_entry_unload( - self.config_entry, component + self.config_entry, platform ) for unsub_dispatcher in self.listeners: diff --git a/homeassistant/components/demo/__init__.py b/homeassistant/components/demo/__init__.py index 09c3d27a1bc..b32537ae44e 100644 --- a/homeassistant/components/demo/__init__.py +++ b/homeassistant/components/demo/__init__.py @@ -50,9 +50,9 @@ async def async_setup(hass, config): ) # Set up demo platforms - for component in COMPONENTS_WITH_DEMO_PLATFORM: + for platform in COMPONENTS_WITH_DEMO_PLATFORM: hass.async_create_task( - hass.helpers.discovery.async_load_platform(component, DOMAIN, {}, config) + hass.helpers.discovery.async_load_platform(platform, DOMAIN, {}, config) ) config.setdefault(ha.DOMAIN, {}) @@ -146,9 +146,9 @@ async def async_setup(hass, config): async def async_setup_entry(hass, config_entry): """Set the config entry up.""" # Set up demo platforms with config entry - for component in COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM: + for platform in COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) return True diff --git a/homeassistant/components/dexcom/__init__.py b/homeassistant/components/dexcom/__init__.py index c2eb9bd466d..5455c49232b 100644 --- a/homeassistant/components/dexcom/__init__.py +++ b/homeassistant/components/dexcom/__init__.py @@ -70,9 +70,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): await hass.data[DOMAIN][entry.entry_id][COORDINATOR].async_refresh() - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -83,8 +83,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/directv/__init__.py b/homeassistant/components/directv/__init__.py index 22a97b9e82e..34b8c5cd30c 100644 --- a/homeassistant/components/directv/__init__.py +++ b/homeassistant/components/directv/__init__.py @@ -45,9 +45,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: hass.data[DOMAIN][entry.entry_id] = dtv - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -58,8 +58,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/doorbird/__init__.py b/homeassistant/components/doorbird/__init__.py index 22db3c76273..8376d75ccbb 100644 --- a/homeassistant/components/doorbird/__init__.py +++ b/homeassistant/components/doorbird/__init__.py @@ -168,9 +168,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): UNDO_UPDATE_LISTENER: undo_listener, } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -188,8 +188,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/dsmr/__init__.py b/homeassistant/components/dsmr/__init__.py index 50823bb1d29..cda3838bf78 100644 --- a/homeassistant/components/dsmr/__init__.py +++ b/homeassistant/components/dsmr/__init__.py @@ -44,8 +44,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/dunehd/__init__.py b/homeassistant/components/dunehd/__init__.py index a1fa456aa09..68a6f0d83de 100644 --- a/homeassistant/components/dunehd/__init__.py +++ b/homeassistant/components/dunehd/__init__.py @@ -24,9 +24,9 @@ async def async_setup_entry(hass, config_entry): hass.data.setdefault(DOMAIN, {}) hass.data[DOMAIN][config_entry.entry_id] = player - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) return True @@ -37,8 +37,8 @@ async def async_unload_entry(hass, config_entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/dynalite/__init__.py b/homeassistant/components/dynalite/__init__.py index e52ec5946b6..e19ab319896 100644 --- a/homeassistant/components/dynalite/__init__.py +++ b/homeassistant/components/dynalite/__init__.py @@ -47,8 +47,8 @@ from .const import ( DEFAULT_PORT, DEFAULT_TEMPLATES, DOMAIN, - ENTITY_PLATFORMS, LOGGER, + PLATFORMS, SERVICE_REQUEST_AREA_PRESET, SERVICE_REQUEST_CHANNEL_LEVEL, ) @@ -267,14 +267,17 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: # need to do it before the listener hass.data[DOMAIN][entry.entry_id] = bridge entry.add_update_listener(async_entry_changed) + if not await bridge.async_setup(): LOGGER.error("Could not set up bridge for entry %s", entry.data) hass.data[DOMAIN][entry.entry_id] = None raise ConfigEntryNotReady - for platform in ENTITY_PLATFORMS: + + for platform in PLATFORMS: hass.async_create_task( hass.config_entries.async_forward_entry_setup(entry, platform) ) + return True @@ -284,7 +287,7 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: hass.data[DOMAIN].pop(entry.entry_id) tasks = [ hass.config_entries.async_forward_entry_unload(entry, platform) - for platform in ENTITY_PLATFORMS + for platform in PLATFORMS ] results = await asyncio.gather(*tasks) return False not in results diff --git a/homeassistant/components/dynalite/bridge.py b/homeassistant/components/dynalite/bridge.py index 5bf21801b3d..e024ba11802 100644 --- a/homeassistant/components/dynalite/bridge.py +++ b/homeassistant/components/dynalite/bridge.py @@ -16,14 +16,7 @@ from homeassistant.const import CONF_HOST from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.dispatcher import async_dispatcher_send -from .const import ( - ATTR_AREA, - ATTR_HOST, - ATTR_PACKET, - ATTR_PRESET, - ENTITY_PLATFORMS, - LOGGER, -) +from .const import ATTR_AREA, ATTR_HOST, ATTR_PACKET, ATTR_PRESET, LOGGER, PLATFORMS from .convert_config import convert_config @@ -107,7 +100,7 @@ class DynaliteBridge: def add_devices_when_registered(self, devices: List[DynaliteBaseDevice]) -> None: """Add the devices to HA if the add devices callback was registered, otherwise queue until it is.""" - for platform in ENTITY_PLATFORMS: + for platform in PLATFORMS: platform_devices = [ device for device in devices if device.category == platform ] diff --git a/homeassistant/components/dynalite/const.py b/homeassistant/components/dynalite/const.py index 3f1e201f3fd..eda43305461 100644 --- a/homeassistant/components/dynalite/const.py +++ b/homeassistant/components/dynalite/const.py @@ -6,7 +6,7 @@ from homeassistant.const import CONF_ROOM LOGGER = logging.getLogger(__package__) DOMAIN = "dynalite" -ENTITY_PLATFORMS = ["light", "switch", "cover"] +PLATFORMS = ["light", "switch", "cover"] CONF_ACTIVE = "active" diff --git a/homeassistant/components/dyson/__init__.py b/homeassistant/components/dyson/__init__.py index b39af2a2fd1..d8023b42973 100644 --- a/homeassistant/components/dyson/__init__.py +++ b/homeassistant/components/dyson/__init__.py @@ -17,7 +17,7 @@ CONF_RETRY = "retry" DEFAULT_TIMEOUT = 5 DEFAULT_RETRY = 10 DYSON_DEVICES = "dyson_devices" -DYSON_PLATFORMS = ["sensor", "fan", "vacuum", "climate", "air_quality"] +PLATFORMS = ["sensor", "fan", "vacuum", "climate", "air_quality"] DOMAIN = "dyson" @@ -105,7 +105,7 @@ def setup(hass, config): # Start fan/sensors components if hass.data[DYSON_DEVICES]: _LOGGER.debug("Starting sensor/fan components") - for platform in DYSON_PLATFORMS: + for platform in PLATFORMS: discovery.load_platform(hass, platform, DOMAIN, {}, config) return True diff --git a/homeassistant/components/ecobee/__init__.py b/homeassistant/components/ecobee/__init__.py index 26bfbe5b3da..015ee1fbf6c 100644 --- a/homeassistant/components/ecobee/__init__.py +++ b/homeassistant/components/ecobee/__init__.py @@ -10,13 +10,7 @@ from homeassistant.const import CONF_API_KEY from homeassistant.helpers import config_validation as cv from homeassistant.util import Throttle -from .const import ( - _LOGGER, - CONF_REFRESH_TOKEN, - DATA_ECOBEE_CONFIG, - DOMAIN, - ECOBEE_PLATFORMS, -) +from .const import _LOGGER, CONF_REFRESH_TOKEN, DATA_ECOBEE_CONFIG, DOMAIN, PLATFORMS MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=180) @@ -32,7 +26,7 @@ async def async_setup(hass, config): But, an "ecobee:" entry in configuration.yaml will trigger an import flow if a config entry doesn't already exist. If ecobee.conf exists, the import flow will attempt to import it and create a config entry, to assist users - migrating from the old ecobee component. Otherwise, the user will have to + migrating from the old ecobee integration. Otherwise, the user will have to continue setting up the integration via the config flow. """ hass.data[DATA_ECOBEE_CONFIG] = config.get(DOMAIN, {}) @@ -66,9 +60,9 @@ async def async_setup_entry(hass, entry): hass.data[DOMAIN] = data - for component in ECOBEE_PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -120,7 +114,7 @@ async def async_unload_entry(hass, config_entry): hass.data.pop(DOMAIN) tasks = [] - for platform in ECOBEE_PLATFORMS: + for platform in PLATFORMS: tasks.append( hass.config_entries.async_forward_entry_unload(config_entry, platform) ) diff --git a/homeassistant/components/ecobee/const.py b/homeassistant/components/ecobee/const.py index 5ec3a0fcf96..44abafe8380 100644 --- a/homeassistant/components/ecobee/const.py +++ b/homeassistant/components/ecobee/const.py @@ -37,7 +37,7 @@ ECOBEE_MODEL_TO_NAME = { "vulcanSmart": "ecobee4 Smart", } -ECOBEE_PLATFORMS = ["binary_sensor", "climate", "sensor", "weather"] +PLATFORMS = ["binary_sensor", "climate", "sensor", "weather"] MANUFACTURER = "ecobee" diff --git a/homeassistant/components/econet/__init__.py b/homeassistant/components/econet/__init__.py index dce4550eb1b..03ca9c76120 100644 --- a/homeassistant/components/econet/__init__.py +++ b/homeassistant/components/econet/__init__.py @@ -60,9 +60,9 @@ async def async_setup_entry(hass, config_entry): hass.data[DOMAIN][API_CLIENT][config_entry.entry_id] = api hass.data[DOMAIN][EQUIPMENT][config_entry.entry_id] = equipment - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) api.subscribe() @@ -92,8 +92,8 @@ async def async_setup_entry(hass, config_entry): async def async_unload_entry(hass, entry): """Unload a EcoNet config entry.""" tasks = [ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] await asyncio.gather(*tasks) diff --git a/homeassistant/components/elkm1/__init__.py b/homeassistant/components/elkm1/__init__.py index d50c5d65d90..3dddd670bb4 100644 --- a/homeassistant/components/elkm1/__init__.py +++ b/homeassistant/components/elkm1/__init__.py @@ -52,7 +52,7 @@ SYNC_TIMEOUT = 120 _LOGGER = logging.getLogger(__name__) -SUPPORTED_DOMAINS = [ +PLATFORMS = [ "alarm_control_panel", "climate", "light", @@ -262,9 +262,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): "keypads": {}, } - for component in SUPPORTED_DOMAINS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -289,8 +289,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in SUPPORTED_DOMAINS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/epson/__init__.py b/homeassistant/components/epson/__init__.py index c7278ed2cc9..51d464dacb5 100644 --- a/homeassistant/components/epson/__init__.py +++ b/homeassistant/components/epson/__init__.py @@ -48,9 +48,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): _LOGGER.warning("Cannot connect to projector %s", entry.data[CONF_HOST]) return False hass.data[DOMAIN][entry.entry_id] = projector - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -60,8 +60,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/faa_delays/__init__.py b/homeassistant/components/faa_delays/__init__.py index b9def765123..fd834da48d8 100644 --- a/homeassistant/components/faa_delays/__init__.py +++ b/homeassistant/components/faa_delays/__init__.py @@ -39,9 +39,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): hass.data[DOMAIN][entry.entry_id] = coordinator - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -52,8 +52,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/fibaro/__init__.py b/homeassistant/components/fibaro/__init__.py index 51e31cf27ad..d2a81468e05 100644 --- a/homeassistant/components/fibaro/__init__.py +++ b/homeassistant/components/fibaro/__init__.py @@ -37,7 +37,7 @@ CONF_RESET_COLOR = "reset_color" DOMAIN = "fibaro" FIBARO_CONTROLLERS = "fibaro_controllers" FIBARO_DEVICES = "fibaro_devices" -FIBARO_COMPONENTS = [ +PLATFORMS = [ "binary_sensor", "climate", "cover", @@ -365,21 +365,21 @@ def setup(hass, base_config): controller.disable_state_handler() hass.data[FIBARO_DEVICES] = {} - for component in FIBARO_COMPONENTS: - hass.data[FIBARO_DEVICES][component] = [] + for platform in PLATFORMS: + hass.data[FIBARO_DEVICES][platform] = [] for gateway in gateways: controller = FibaroController(gateway) if controller.connect(): hass.data[FIBARO_CONTROLLERS][controller.hub_serial] = controller - for component in FIBARO_COMPONENTS: - hass.data[FIBARO_DEVICES][component].extend( - controller.fibaro_devices[component] + for platform in PLATFORMS: + hass.data[FIBARO_DEVICES][platform].extend( + controller.fibaro_devices[platform] ) if hass.data[FIBARO_CONTROLLERS]: - for component in FIBARO_COMPONENTS: - discovery.load_platform(hass, component, DOMAIN, {}, base_config) + for platform in PLATFORMS: + discovery.load_platform(hass, platform, DOMAIN, {}, base_config) for controller in hass.data[FIBARO_CONTROLLERS].values(): controller.enable_state_handler() hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, stop_fibaro) diff --git a/homeassistant/components/fireservicerota/__init__.py b/homeassistant/components/fireservicerota/__init__.py index bf5f3f6beea..513a572b2c2 100644 --- a/homeassistant/components/fireservicerota/__init__.py +++ b/homeassistant/components/fireservicerota/__init__.py @@ -26,7 +26,7 @@ MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=60) _LOGGER = logging.getLogger(__name__) -SUPPORTED_PLATFORMS = {SENSOR_DOMAIN, BINARYSENSOR_DOMAIN, SWITCH_DOMAIN} +PLATFORMS = [SENSOR_DOMAIN, BINARYSENSOR_DOMAIN, SWITCH_DOMAIN] async def async_setup(hass: HomeAssistant, config: dict) -> bool: @@ -64,7 +64,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: DATA_COORDINATOR: coordinator, } - for platform in SUPPORTED_PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( hass.config_entries.async_forward_entry_setup(entry, platform) ) @@ -83,7 +83,7 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: await asyncio.gather( *[ hass.config_entries.async_forward_entry_unload(entry, platform) - for platform in SUPPORTED_PLATFORMS + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/flo/__init__.py b/homeassistant/components/flo/__init__.py index b57cdd5f871..71f8a8bfe5c 100644 --- a/homeassistant/components/flo/__init__.py +++ b/homeassistant/components/flo/__init__.py @@ -49,9 +49,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): tasks = [device.async_refresh() for device in devices] await asyncio.gather(*tasks) - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -62,8 +62,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/flume/__init__.py b/homeassistant/components/flume/__init__.py index b9a5fc17682..fb87588ac82 100644 --- a/homeassistant/components/flume/__init__.py +++ b/homeassistant/components/flume/__init__.py @@ -79,9 +79,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): FLUME_HTTP_SESSION: http_session, } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -92,8 +92,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/flunearyou/__init__.py b/homeassistant/components/flunearyou/__init__.py index 46442f112b6..8e5e3762f32 100644 --- a/homeassistant/components/flunearyou/__init__.py +++ b/homeassistant/components/flunearyou/__init__.py @@ -67,9 +67,9 @@ async def async_setup_entry(hass, config_entry): await asyncio.gather(*data_init_tasks) - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) return True @@ -80,8 +80,8 @@ async def async_unload_entry(hass, config_entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/foscam/__init__.py b/homeassistant/components/foscam/__init__.py index 6a2c961544f..1b3ae5e7216 100644 --- a/homeassistant/components/foscam/__init__.py +++ b/homeassistant/components/foscam/__init__.py @@ -22,9 +22,9 @@ async def async_setup(hass: HomeAssistant, config: dict): async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): """Set up foscam from a config entry.""" - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) hass.data[DOMAIN][entry.entry_id] = entry.data @@ -37,8 +37,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/fritzbox/__init__.py b/homeassistant/components/fritzbox/__init__.py index 3c01657da4e..34f56ddc6f9 100644 --- a/homeassistant/components/fritzbox/__init__.py +++ b/homeassistant/components/fritzbox/__init__.py @@ -93,9 +93,9 @@ async def async_setup_entry(hass, entry): hass.data.setdefault(DOMAIN, {CONF_CONNECTIONS: {}, CONF_DEVICES: set()}) hass.data[DOMAIN][CONF_CONNECTIONS][entry.entry_id] = fritz - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) def logout_fritzbox(event): @@ -115,8 +115,8 @@ async def async_unload_entry(hass, entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/fritzbox_callmonitor/__init__.py b/homeassistant/components/fritzbox_callmonitor/__init__.py index 933dd797dfc..0527b7164d3 100644 --- a/homeassistant/components/fritzbox_callmonitor/__init__.py +++ b/homeassistant/components/fritzbox_callmonitor/__init__.py @@ -59,9 +59,9 @@ async def async_setup_entry(hass, config_entry): UNDO_UPDATE_LISTENER: undo_listener, } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) return True @@ -73,8 +73,8 @@ async def async_unload_entry(hass, config_entry): unload_ok = all( await gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/garmin_connect/__init__.py b/homeassistant/components/garmin_connect/__init__.py index 896c243f386..c009124b024 100644 --- a/homeassistant/components/garmin_connect/__init__.py +++ b/homeassistant/components/garmin_connect/__init__.py @@ -57,9 +57,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): garmin_data = GarminConnectData(hass, garmin_client) hass.data[DOMAIN][entry.entry_id] = garmin_data - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -70,8 +70,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/goalzero/__init__.py b/homeassistant/components/goalzero/__init__.py index ff60a9ac043..e00b17ebae4 100644 --- a/homeassistant/components/goalzero/__init__.py +++ b/homeassistant/components/goalzero/__init__.py @@ -76,8 +76,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/guardian/__init__.py b/homeassistant/components/guardian/__init__.py index fdc82f14778..465e1d730af 100644 --- a/homeassistant/components/guardian/__init__.py +++ b/homeassistant/components/guardian/__init__.py @@ -104,9 +104,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: ].async_add_listener(async_process_paired_sensor_uids) # Set up all of the Guardian entity platforms: - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -117,8 +117,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/habitica/__init__.py b/homeassistant/components/habitica/__init__.py index c70d374dfe9..159e760e223 100644 --- a/homeassistant/components/habitica/__init__.py +++ b/homeassistant/components/habitica/__init__.py @@ -148,9 +148,9 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b ) data[config_entry.entry_id] = api - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) if not hass.services.has_service(DOMAIN, SERVICE_API_CALL): @@ -166,8 +166,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/harmony/__init__.py b/homeassistant/components/harmony/__init__.py index 8445c7be937..c4056044ca0 100644 --- a/homeassistant/components/harmony/__init__.py +++ b/homeassistant/components/harmony/__init__.py @@ -48,9 +48,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): entry.add_update_listener(_update_listener) - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -108,8 +108,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/home_connect/__init__.py b/homeassistant/components/home_connect/__init__.py index 301bd1976e6..baf4fd17f85 100644 --- a/homeassistant/components/home_connect/__init__.py +++ b/homeassistant/components/home_connect/__init__.py @@ -71,9 +71,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: await update_all_devices(hass, entry) - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -84,8 +84,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/homematicip_cloud/const.py b/homeassistant/components/homematicip_cloud/const.py index 4fb21febb40..31ccb8b9bc7 100644 --- a/homeassistant/components/homematicip_cloud/const.py +++ b/homeassistant/components/homematicip_cloud/const.py @@ -16,7 +16,7 @@ _LOGGER = logging.getLogger(".") DOMAIN = "homematicip_cloud" -COMPONENTS = [ +PLATFORMS = [ ALARM_CONTROL_PANEL_DOMAIN, BINARY_SENSOR_DOMAIN, CLIMATE_DOMAIN, diff --git a/homeassistant/components/homematicip_cloud/hap.py b/homeassistant/components/homematicip_cloud/hap.py index 151807391b9..5ad4efed1f6 100644 --- a/homeassistant/components/homematicip_cloud/hap.py +++ b/homeassistant/components/homematicip_cloud/hap.py @@ -13,7 +13,7 @@ from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.typing import HomeAssistantType -from .const import COMPONENTS, HMIPC_AUTHTOKEN, HMIPC_HAPID, HMIPC_NAME, HMIPC_PIN +from .const import HMIPC_AUTHTOKEN, HMIPC_HAPID, HMIPC_NAME, HMIPC_PIN, PLATFORMS from .errors import HmipcConnectionError _LOGGER = logging.getLogger(__name__) @@ -102,10 +102,10 @@ class HomematicipHAP: "Connected to HomematicIP with HAP %s", self.config_entry.unique_id ) - for component in COMPONENTS: + for platform in PLATFORMS: self.hass.async_create_task( self.hass.config_entries.async_forward_entry_setup( - self.config_entry, component + self.config_entry, platform ) ) return True @@ -215,9 +215,9 @@ class HomematicipHAP: self._retry_task.cancel() await self.home.disable_events() _LOGGER.info("Closed connection to HomematicIP cloud server") - for component in COMPONENTS: + for platform in PLATFORMS: await self.hass.config_entries.async_forward_entry_unload( - self.config_entry, component + self.config_entry, platform ) self.hmip_device_by_entity_id = {} return True diff --git a/homeassistant/components/hunterdouglas_powerview/__init__.py b/homeassistant/components/hunterdouglas_powerview/__init__.py index 7555146ba8e..2a5c5061cae 100644 --- a/homeassistant/components/hunterdouglas_powerview/__init__.py +++ b/homeassistant/components/hunterdouglas_powerview/__init__.py @@ -132,9 +132,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): DEVICE_INFO: device_info, } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -180,8 +180,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/hvv_departures/__init__.py b/homeassistant/components/hvv_departures/__init__.py index e003b25ea85..c90e5cb6d9c 100644 --- a/homeassistant/components/hvv_departures/__init__.py +++ b/homeassistant/components/hvv_departures/__init__.py @@ -32,9 +32,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): hass.data.setdefault(DOMAIN, {}) hass.data[DOMAIN][entry.entry_id] = hub - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -45,8 +45,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/hyperion/__init__.py b/homeassistant/components/hyperion/__init__.py index 8c001c2b467..e5e6cb4494a 100644 --- a/homeassistant/components/hyperion/__init__.py +++ b/homeassistant/components/hyperion/__init__.py @@ -281,8 +281,8 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b async def setup_then_listen() -> None: await asyncio.gather( *[ - hass.config_entries.async_forward_entry_setup(config_entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_setup(config_entry, platform) + for platform in PLATFORMS ] ) assert hyperion_client @@ -310,8 +310,8 @@ async def async_unload_entry( unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/ihc/__init__.py b/homeassistant/components/ihc/__init__.py index c539156b759..959d86a7cc1 100644 --- a/homeassistant/components/ihc/__init__.py +++ b/homeassistant/components/ihc/__init__.py @@ -55,7 +55,7 @@ DOMAIN = "ihc" IHC_CONTROLLER = "controller" IHC_INFO = "info" -IHC_PLATFORMS = ("binary_sensor", "light", "sensor", "switch") +PLATFORMS = ("binary_sensor", "light", "sensor", "switch") def validate_name(config): @@ -219,7 +219,7 @@ PULSE_SCHEMA = vol.Schema( def setup(hass, config): - """Set up the IHC platform.""" + """Set up the IHC integration.""" conf = config.get(DOMAIN) for index, controller_conf in enumerate(conf): if not ihc_setup(hass, config, controller_conf, index): @@ -229,7 +229,7 @@ def setup(hass, config): def ihc_setup(hass, config, conf, controller_id): - """Set up the IHC component.""" + """Set up the IHC integration.""" url = conf[CONF_URL] username = conf[CONF_USERNAME] password = conf[CONF_PASSWORD] @@ -256,11 +256,11 @@ def ihc_setup(hass, config, conf, controller_id): def get_manual_configuration(hass, config, conf, ihc_controller, controller_id): """Get manual configuration for IHC devices.""" - for component in IHC_PLATFORMS: + for platform in PLATFORMS: discovery_info = {} - if component in conf: - component_setup = conf.get(component) - for sensor_cfg in component_setup: + if platform in conf: + platform_setup = conf.get(platform) + for sensor_cfg in platform_setup: name = sensor_cfg[CONF_NAME] device = { "ihc_id": sensor_cfg[CONF_ID], @@ -281,7 +281,7 @@ def get_manual_configuration(hass, config, conf, ihc_controller, controller_id): } discovery_info[name] = device if discovery_info: - discovery.load_platform(hass, component, DOMAIN, discovery_info, config) + discovery.load_platform(hass, platform, DOMAIN, discovery_info, config) def autosetup_ihc_products( @@ -304,21 +304,23 @@ def autosetup_ihc_products( except vol.Invalid as exception: _LOGGER.error("Invalid IHC auto setup data: %s", exception) return False + groups = project.findall(".//group") - for component in IHC_PLATFORMS: - component_setup = auto_setup_conf[component] - discovery_info = get_discovery_info(component_setup, groups, controller_id) + for platform in PLATFORMS: + platform_setup = auto_setup_conf[platform] + discovery_info = get_discovery_info(platform_setup, groups, controller_id) if discovery_info: - discovery.load_platform(hass, component, DOMAIN, discovery_info, config) + discovery.load_platform(hass, platform, DOMAIN, discovery_info, config) + return True -def get_discovery_info(component_setup, groups, controller_id): - """Get discovery info for specified IHC component.""" +def get_discovery_info(platform_setup, groups, controller_id): + """Get discovery info for specified IHC platform.""" discovery_data = {} for group in groups: groupname = group.attrib["name"] - for product_cfg in component_setup: + for product_cfg in platform_setup: products = group.findall(product_cfg[CONF_XPATH]) for product in products: nodes = product.findall(product_cfg[CONF_NODE]) diff --git a/homeassistant/components/insteon/__init__.py b/homeassistant/components/insteon/__init__.py index 0188671e07f..7fb2178def4 100644 --- a/homeassistant/components/insteon/__init__.py +++ b/homeassistant/components/insteon/__init__.py @@ -17,7 +17,7 @@ from .const import ( CONF_UNITCODE, CONF_X10, DOMAIN, - INSTEON_COMPONENTS, + INSTEON_PLATFORMS, ON_OFF_EVENTS, ) from .schemas import convert_yaml_to_config_flow @@ -138,9 +138,9 @@ async def async_setup_entry(hass, entry): ) device = devices.add_x10_device(housecode, unitcode, x10_type, steps) - for component in INSTEON_COMPONENTS: + for platform in INSTEON_PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) for address in devices: diff --git a/homeassistant/components/insteon/const.py b/homeassistant/components/insteon/const.py index 07717dade9b..a40a0b0d4b0 100644 --- a/homeassistant/components/insteon/const.py +++ b/homeassistant/components/insteon/const.py @@ -34,7 +34,7 @@ from pyinsteon.groups import ( DOMAIN = "insteon" -INSTEON_COMPONENTS = [ +INSTEON_PLATFORMS = [ "binary_sensor", "climate", "cover", diff --git a/homeassistant/components/ipp/__init__.py b/homeassistant/components/ipp/__init__.py index 7a18da03ddc..c36b0cb7959 100644 --- a/homeassistant/components/ipp/__init__.py +++ b/homeassistant/components/ipp/__init__.py @@ -66,9 +66,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: if not coordinator.last_update_success: raise ConfigEntryNotReady - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -79,8 +79,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/iqvia/__init__.py b/homeassistant/components/iqvia/__init__.py index bf1725a036a..4dc066d7629 100644 --- a/homeassistant/components/iqvia/__init__.py +++ b/homeassistant/components/iqvia/__init__.py @@ -84,9 +84,9 @@ async def async_setup_entry(hass, entry): await asyncio.gather(*init_data_update_tasks) - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -97,8 +97,8 @@ async def async_unload_entry(hass, entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/isy994/__init__.py b/homeassistant/components/isy994/__init__.py index 9fd844521d7..d07fef97edd 100644 --- a/homeassistant/components/isy994/__init__.py +++ b/homeassistant/components/isy994/__init__.py @@ -31,7 +31,7 @@ from .const import ( ISY994_PROGRAMS, ISY994_VARIABLES, MANUFACTURER, - SUPPORTED_PLATFORMS, + PLATFORMS, SUPPORTED_PROGRAM_PLATFORMS, UNDO_UPDATE_LISTENER, ) @@ -111,7 +111,7 @@ async def async_setup_entry( hass_isy_data = hass.data[DOMAIN][entry.entry_id] hass_isy_data[ISY994_NODES] = {} - for platform in SUPPORTED_PLATFORMS: + for platform in PLATFORMS: hass_isy_data[ISY994_NODES][platform] = [] hass_isy_data[ISY994_PROGRAMS] = {} @@ -176,7 +176,7 @@ async def async_setup_entry( await _async_get_or_create_isy_device_in_registry(hass, entry, isy) # Load platforms for the devices in the ISY controller that we support. - for platform in SUPPORTED_PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( hass.config_entries.async_forward_entry_setup(entry, platform) ) @@ -248,7 +248,7 @@ async def async_unload_entry( await asyncio.gather( *[ hass.config_entries.async_forward_entry_unload(entry, platform) - for platform in SUPPORTED_PLATFORMS + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/isy994/const.py b/homeassistant/components/isy994/const.py index ef75a974377..9fdef92c84f 100644 --- a/homeassistant/components/isy994/const.py +++ b/homeassistant/components/isy994/const.py @@ -129,7 +129,7 @@ DEFAULT_VAR_SENSOR_STRING = "HA." KEY_ACTIONS = "actions" KEY_STATUS = "status" -SUPPORTED_PLATFORMS = [BINARY_SENSOR, SENSOR, LOCK, FAN, COVER, LIGHT, SWITCH, CLIMATE] +PLATFORMS = [BINARY_SENSOR, SENSOR, LOCK, FAN, COVER, LIGHT, SWITCH, CLIMATE] SUPPORTED_PROGRAM_PLATFORMS = [BINARY_SENSOR, LOCK, FAN, COVER, SWITCH] SUPPORTED_BIN_SENS_CLASSES = ["moisture", "opening", "motion", "climate"] diff --git a/homeassistant/components/isy994/helpers.py b/homeassistant/components/isy994/helpers.py index f9834586583..fecf18f789b 100644 --- a/homeassistant/components/isy994/helpers.py +++ b/homeassistant/components/isy994/helpers.py @@ -38,12 +38,12 @@ from .const import ( KEY_ACTIONS, KEY_STATUS, NODE_FILTERS, + PLATFORMS, SUBNODE_CLIMATE_COOL, SUBNODE_CLIMATE_HEAT, SUBNODE_EZIO2X4_SENSORS, SUBNODE_FANLINC_LIGHT, SUBNODE_IOLINC_RELAY, - SUPPORTED_PLATFORMS, SUPPORTED_PROGRAM_PLATFORMS, TYPE_CATEGORY_SENSOR_ACTUATORS, TYPE_EZIO2X4, @@ -69,7 +69,7 @@ def _check_for_node_def( node_def_id = node.node_def_id - platforms = SUPPORTED_PLATFORMS if not single_platform else [single_platform] + platforms = PLATFORMS if not single_platform else [single_platform] for platform in platforms: if node_def_id in NODE_FILTERS[platform][FILTER_NODE_DEF_ID]: hass_isy_data[ISY994_NODES][platform].append(node) @@ -94,7 +94,7 @@ def _check_for_insteon_type( return False device_type = node.type - platforms = SUPPORTED_PLATFORMS if not single_platform else [single_platform] + platforms = PLATFORMS if not single_platform else [single_platform] for platform in platforms: if any( device_type.startswith(t) @@ -159,7 +159,7 @@ def _check_for_zwave_cat( return False device_type = node.zwave_props.category - platforms = SUPPORTED_PLATFORMS if not single_platform else [single_platform] + platforms = PLATFORMS if not single_platform else [single_platform] for platform in platforms: if any( device_type.startswith(t) @@ -198,7 +198,7 @@ def _check_for_uom_id( return True return False - platforms = SUPPORTED_PLATFORMS if not single_platform else [single_platform] + platforms = PLATFORMS if not single_platform else [single_platform] for platform in platforms: if node_uom in NODE_FILTERS[platform][FILTER_UOM]: hass_isy_data[ISY994_NODES][platform].append(node) @@ -235,7 +235,7 @@ def _check_for_states_in_uom( return True return False - platforms = SUPPORTED_PLATFORMS if not single_platform else [single_platform] + platforms = PLATFORMS if not single_platform else [single_platform] for platform in platforms: if node_uom == set(NODE_FILTERS[platform][FILTER_STATES]): hass_isy_data[ISY994_NODES][platform].append(node) diff --git a/homeassistant/components/isy994/services.py b/homeassistant/components/isy994/services.py index 3e9e0ae1d29..b9c4bcdeef2 100644 --- a/homeassistant/components/isy994/services.py +++ b/homeassistant/components/isy994/services.py @@ -27,7 +27,7 @@ from .const import ( ISY994_NODES, ISY994_PROGRAMS, ISY994_VARIABLES, - SUPPORTED_PLATFORMS, + PLATFORMS, SUPPORTED_PROGRAM_PLATFORMS, ) @@ -279,7 +279,7 @@ def async_setup_services(hass: HomeAssistantType): hass_isy_data = hass.data[DOMAIN][config_entry_id] uuid = hass_isy_data[ISY994_ISY].configuration["uuid"] - for platform in SUPPORTED_PLATFORMS: + for platform in PLATFORMS: for node in hass_isy_data[ISY994_NODES][platform]: if hasattr(node, "address"): current_unique_ids.append(f"{uuid}_{node.address}") diff --git a/homeassistant/components/juicenet/__init__.py b/homeassistant/components/juicenet/__init__.py index 080df7be6bf..42bce53f911 100644 --- a/homeassistant/components/juicenet/__init__.py +++ b/homeassistant/components/juicenet/__init__.py @@ -91,9 +91,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): await coordinator.async_refresh() - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -104,8 +104,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/kaiterra/__init__.py b/homeassistant/components/kaiterra/__init__.py index d043dc15eaf..eae14bd330e 100644 --- a/homeassistant/components/kaiterra/__init__.py +++ b/homeassistant/components/kaiterra/__init__.py @@ -25,7 +25,7 @@ from .const import ( DEFAULT_PREFERRED_UNIT, DEFAULT_SCAN_INTERVAL, DOMAIN, - KAITERRA_COMPONENTS, + PLATFORMS, ) KAITERRA_DEVICE_SCHEMA = vol.Schema( @@ -54,7 +54,7 @@ CONFIG_SCHEMA = vol.Schema({DOMAIN: KAITERRA_SCHEMA}, extra=vol.ALLOW_EXTRA) async def async_setup(hass, config): - """Set up the Kaiterra components.""" + """Set up the Kaiterra integration.""" conf = config[DOMAIN] scan_interval = conf[CONF_SCAN_INTERVAL] @@ -76,11 +76,11 @@ async def async_setup(hass, config): device.get(CONF_NAME) or device[CONF_TYPE], device[CONF_DEVICE_ID], ) - for component in KAITERRA_COMPONENTS: + for platform in PLATFORMS: hass.async_create_task( async_load_platform( hass, - component, + platform, DOMAIN, {CONF_NAME: device_name, CONF_DEVICE_ID: device_id}, config, diff --git a/homeassistant/components/kaiterra/const.py b/homeassistant/components/kaiterra/const.py index 583cd60085d..f4cc5638c18 100644 --- a/homeassistant/components/kaiterra/const.py +++ b/homeassistant/components/kaiterra/const.py @@ -71,4 +71,4 @@ DEFAULT_AQI_STANDARD = "us" DEFAULT_PREFERRED_UNIT = [] DEFAULT_SCAN_INTERVAL = timedelta(seconds=30) -KAITERRA_COMPONENTS = ["sensor", "air_quality"] +PLATFORMS = ["sensor", "air_quality"] diff --git a/homeassistant/components/keenetic_ndms2/__init__.py b/homeassistant/components/keenetic_ndms2/__init__.py index 42d747b5238..d0217b2a4f5 100644 --- a/homeassistant/components/keenetic_ndms2/__init__.py +++ b/homeassistant/components/keenetic_ndms2/__init__.py @@ -44,9 +44,9 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b UNDO_UPDATE_LISTENER: undo_listener, } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) return True @@ -56,8 +56,8 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> """Unload a config entry.""" hass.data[DOMAIN][config_entry.entry_id][UNDO_UPDATE_LISTENER]() - for component in PLATFORMS: - await hass.config_entries.async_forward_entry_unload(config_entry, component) + for platform in PLATFORMS: + await hass.config_entries.async_forward_entry_unload(config_entry, platform) router: KeeneticRouter = hass.data[DOMAIN][config_entry.entry_id][ROUTER] diff --git a/homeassistant/components/kmtronic/__init__.py b/homeassistant/components/kmtronic/__init__.py index b55ab9e1c9c..1f012985447 100644 --- a/homeassistant/components/kmtronic/__init__.py +++ b/homeassistant/components/kmtronic/__init__.py @@ -80,9 +80,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): DATA_COORDINATOR: coordinator, } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -93,8 +93,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/kodi/__init__.py b/homeassistant/components/kodi/__init__.py index 4dcb25b3ea9..ea867e8c407 100644 --- a/homeassistant/components/kodi/__init__.py +++ b/homeassistant/components/kodi/__init__.py @@ -72,9 +72,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): DATA_REMOVE_LISTENER: remove_stop_listener, } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -85,8 +85,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/konnected/__init__.py b/homeassistant/components/konnected/__init__.py index 348eaeda3ac..7ed4d5c1ac6 100644 --- a/homeassistant/components/konnected/__init__.py +++ b/homeassistant/components/konnected/__init__.py @@ -261,9 +261,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): # async_connect will handle retries until it establishes a connection await client.async_connect() - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) # config entry specific data to enable unload @@ -278,8 +278,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/kulersky/__init__.py b/homeassistant/components/kulersky/__init__.py index 9459d44805c..666239ad22b 100644 --- a/homeassistant/components/kulersky/__init__.py +++ b/homeassistant/components/kulersky/__init__.py @@ -16,9 +16,9 @@ async def async_setup(hass: HomeAssistant, config: dict): async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): """Set up Kuler Sky from a config entry.""" - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -29,8 +29,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/litejet/__init__.py b/homeassistant/components/litejet/__init__.py index 0c8f59c4127..f00853af524 100644 --- a/homeassistant/components/litejet/__init__.py +++ b/homeassistant/components/litejet/__init__.py @@ -59,9 +59,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: hass.data[DOMAIN] = system - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -73,8 +73,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/litterrobot/__init__.py b/homeassistant/components/litterrobot/__init__.py index 19e76b9bb19..84e6822dc13 100644 --- a/homeassistant/components/litterrobot/__init__.py +++ b/homeassistant/components/litterrobot/__init__.py @@ -30,9 +30,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): except LitterRobotException as ex: raise ConfigEntryNotReady from ex - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -43,8 +43,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/logi_circle/__init__.py b/homeassistant/components/logi_circle/__init__.py index 056783ef6da..3364cd725c7 100644 --- a/homeassistant/components/logi_circle/__init__.py +++ b/homeassistant/components/logi_circle/__init__.py @@ -47,6 +47,8 @@ SERVICE_LIVESTREAM_RECORD = "livestream_record" ATTR_VALUE = "value" ATTR_DURATION = "duration" +PLATFORMS = ["camera", "sensor"] + SENSOR_SCHEMA = vol.Schema( { vol.Optional(CONF_MONITORED_CONDITIONS, default=list(LOGI_SENSORS)): vol.All( @@ -171,9 +173,9 @@ async def async_setup_entry(hass, entry): hass.data[DATA_LOGI] = logi_circle - for component in "camera", "sensor": + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) async def service_handler(service): @@ -219,8 +221,8 @@ async def async_setup_entry(hass, entry): async def async_unload_entry(hass, entry): """Unload a config entry.""" - for component in "camera", "sensor": - await hass.config_entries.async_forward_entry_unload(entry, component) + for platform in PLATFORMS: + await hass.config_entries.async_forward_entry_unload(entry, platform) logi_circle = hass.data.pop(DATA_LOGI) diff --git a/homeassistant/components/lutron/__init__.py b/homeassistant/components/lutron/__init__.py index 2eeebac4c96..b38968c36b8 100644 --- a/homeassistant/components/lutron/__init__.py +++ b/homeassistant/components/lutron/__init__.py @@ -12,6 +12,8 @@ from homeassistant.util import slugify DOMAIN = "lutron" +PLATFORMS = ["light", "cover", "switch", "scene", "binary_sensor"] + _LOGGER = logging.getLogger(__name__) LUTRON_BUTTONS = "lutron_buttons" @@ -37,7 +39,7 @@ CONFIG_SCHEMA = vol.Schema( def setup(hass, base_config): - """Set up the Lutron component.""" + """Set up the Lutron integration.""" hass.data[LUTRON_BUTTONS] = [] hass.data[LUTRON_CONTROLLER] = None hass.data[LUTRON_DEVICES] = { @@ -92,8 +94,8 @@ def setup(hass, base_config): (area.name, area.occupancy_group) ) - for component in ("light", "cover", "switch", "scene", "binary_sensor"): - discovery.load_platform(hass, component, DOMAIN, {}, base_config) + for platform in PLATFORMS: + discovery.load_platform(hass, platform, DOMAIN, {}, base_config) return True diff --git a/homeassistant/components/lutron_caseta/__init__.py b/homeassistant/components/lutron_caseta/__init__.py index 56cc7a78c96..f93833acfc5 100644 --- a/homeassistant/components/lutron_caseta/__init__.py +++ b/homeassistant/components/lutron_caseta/__init__.py @@ -62,7 +62,7 @@ CONFIG_SCHEMA = vol.Schema( extra=vol.ALLOW_EXTRA, ) -LUTRON_CASETA_COMPONENTS = ["light", "switch", "cover", "scene", "fan", "binary_sensor"] +PLATFORMS = ["light", "switch", "cover", "scene", "fan", "binary_sensor"] async def async_setup(hass, base_config): @@ -125,7 +125,7 @@ async def async_setup_entry(hass, config_entry): bridge_device = devices[BRIDGE_DEVICE_ID] await _async_register_bridge_device(hass, config_entry.entry_id, bridge_device) # Store this bridge (keyed by entry_id) so it can be retrieved by the - # components we're setting up. + # platforms we're setting up. hass.data[DOMAIN][config_entry.entry_id] = { BRIDGE_LEAP: bridge, BRIDGE_DEVICE: bridge_device, @@ -139,9 +139,9 @@ async def async_setup_entry(hass, config_entry): # pico remotes to control other devices. await async_setup_lip(hass, config_entry, bridge.lip_devices) - for component in LUTRON_CASETA_COMPONENTS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) return True @@ -289,8 +289,8 @@ async def async_unload_entry(hass, config_entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in LUTRON_CASETA_COMPONENTS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/lyric/__init__.py b/homeassistant/components/lyric/__init__.py index 12990d66ba9..8b23d6f85cf 100644 --- a/homeassistant/components/lyric/__init__.py +++ b/homeassistant/components/lyric/__init__.py @@ -113,9 +113,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: if not coordinator.last_update_success: raise ConfigEntryNotReady - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -126,8 +126,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/mazda/__init__.py b/homeassistant/components/mazda/__init__.py index 14b33df66c0..1b1e6584a0e 100644 --- a/homeassistant/components/mazda/__init__.py +++ b/homeassistant/components/mazda/__init__.py @@ -121,9 +121,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): raise ConfigEntryNotReady # Setup components - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -134,8 +134,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/metoffice/__init__.py b/homeassistant/components/metoffice/__init__.py index 8a68646240a..87a5488fe01 100644 --- a/homeassistant/components/metoffice/__init__.py +++ b/homeassistant/components/metoffice/__init__.py @@ -61,9 +61,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): if metoffice_data.now is None: raise ConfigEntryNotReady() - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -74,8 +74,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/mobile_app/__init__.py b/homeassistant/components/mobile_app/__init__.py index e1476270844..4ba6a6f2086 100644 --- a/homeassistant/components/mobile_app/__init__.py +++ b/homeassistant/components/mobile_app/__init__.py @@ -104,8 +104,8 @@ async def async_unload_entry(hass, entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/monoprice/__init__.py b/homeassistant/components/monoprice/__init__.py index 06883ddc8a8..adc0b05bab7 100644 --- a/homeassistant/components/monoprice/__init__.py +++ b/homeassistant/components/monoprice/__init__.py @@ -54,9 +54,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): FIRST_RUN: first_run, } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -67,8 +67,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/motion_blinds/__init__.py b/homeassistant/components/motion_blinds/__init__.py index 5d02d5a14a8..c6226bed910 100644 --- a/homeassistant/components/motion_blinds/__init__.py +++ b/homeassistant/components/motion_blinds/__init__.py @@ -18,7 +18,7 @@ from .const import ( KEY_GATEWAY, KEY_MULTICAST_LISTENER, MANUFACTURER, - MOTION_PLATFORMS, + PLATFORMS, ) from .gateway import ConnectMotionGateway @@ -107,9 +107,9 @@ async def async_setup_entry( sw_version=motion_gateway.protocol, ) - for component in MOTION_PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -122,8 +122,8 @@ async def async_unload_entry( unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in MOTION_PLATFORMS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/motion_blinds/const.py b/homeassistant/components/motion_blinds/const.py index 27f2310c7ce..4b1f0ee0527 100644 --- a/homeassistant/components/motion_blinds/const.py +++ b/homeassistant/components/motion_blinds/const.py @@ -3,7 +3,7 @@ DOMAIN = "motion_blinds" MANUFACTURER = "Motion Blinds, Coulisse B.V." DEFAULT_GATEWAY_NAME = "Motion Blinds Gateway" -MOTION_PLATFORMS = ["cover", "sensor"] +PLATFORMS = ["cover", "sensor"] KEY_GATEWAY = "gateway" KEY_COORDINATOR = "coordinator" diff --git a/homeassistant/components/mullvad/__init__.py b/homeassistant/components/mullvad/__init__.py index 20a7092d58a..b506be93100 100644 --- a/homeassistant/components/mullvad/__init__.py +++ b/homeassistant/components/mullvad/__init__.py @@ -43,9 +43,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: dict): hass.data[DOMAIN] = coordinator - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -56,8 +56,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/myq/__init__.py b/homeassistant/components/myq/__init__.py index 6b3a52ba7b0..b25751d7270 100644 --- a/homeassistant/components/myq/__init__.py +++ b/homeassistant/components/myq/__init__.py @@ -58,9 +58,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): hass.data[DOMAIN][entry.entry_id] = {MYQ_GATEWAY: myq, MYQ_COORDINATOR: coordinator} - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -71,8 +71,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/mysensors/__init__.py b/homeassistant/components/mysensors/__init__.py index 25b4d3106da..33ac4932889 100644 --- a/homeassistant/components/mysensors/__init__.py +++ b/homeassistant/components/mysensors/__init__.py @@ -30,7 +30,7 @@ from .const import ( DOMAIN, MYSENSORS_GATEWAYS, MYSENSORS_ON_UNLOAD, - SUPPORTED_PLATFORMS_WITH_ENTRY_SUPPORT, + PLATFORMS_WITH_ENTRY_SUPPORT, DevId, GatewayId, SensorType, @@ -192,7 +192,7 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool await asyncio.gather( *[ hass.config_entries.async_forward_entry_setup(entry, platform) - for platform in SUPPORTED_PLATFORMS_WITH_ENTRY_SUPPORT + for platform in PLATFORMS_WITH_ENTRY_SUPPORT ] ) await finish_setup(hass, entry, gateway) @@ -211,7 +211,7 @@ async def async_unload_entry(hass: HomeAssistantType, entry: ConfigEntry) -> boo await asyncio.gather( *[ hass.config_entries.async_forward_entry_unload(entry, platform) - for platform in SUPPORTED_PLATFORMS_WITH_ENTRY_SUPPORT + for platform in PLATFORMS_WITH_ENTRY_SUPPORT ] ) ) diff --git a/homeassistant/components/mysensors/const.py b/homeassistant/components/mysensors/const.py index 66bee128d4d..700c2bb930a 100644 --- a/homeassistant/components/mysensors/const.py +++ b/homeassistant/components/mysensors/const.py @@ -158,7 +158,7 @@ for platform, platform_types in PLATFORM_TYPES.items(): for s_type_name in platform_types: TYPE_TO_PLATFORMS[s_type_name].append(platform) -SUPPORTED_PLATFORMS_WITH_ENTRY_SUPPORT = set(PLATFORM_TYPES.keys()) - { +PLATFORMS_WITH_ENTRY_SUPPORT = set(PLATFORM_TYPES.keys()) - { "notify", "device_tracker", } diff --git a/homeassistant/components/n26/__init__.py b/homeassistant/components/n26/__init__.py index f8379cb310f..b1e83cd5311 100644 --- a/homeassistant/components/n26/__init__.py +++ b/homeassistant/components/n26/__init__.py @@ -36,7 +36,7 @@ CONFIG_SCHEMA = vol.Schema( extra=vol.ALLOW_EXTRA, ) -N26_COMPONENTS = ["sensor", "switch"] +PLATFORMS = ["sensor", "switch"] def setup(hass, config): @@ -65,9 +65,9 @@ def setup(hass, config): hass.data[DOMAIN] = {} hass.data[DOMAIN][DATA] = api_data_list - # Load components for supported devices - for component in N26_COMPONENTS: - load_platform(hass, component, DOMAIN, {}, config) + # Load platforms for supported devices + for platform in PLATFORMS: + load_platform(hass, platform, DOMAIN, {}, config) return True diff --git a/homeassistant/components/neato/__init__.py b/homeassistant/components/neato/__init__.py index 1d9d3de4f89..bb0db8ebd85 100644 --- a/homeassistant/components/neato/__init__.py +++ b/homeassistant/components/neato/__init__.py @@ -103,9 +103,9 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool hass.data[NEATO_LOGIN] = hub - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True diff --git a/homeassistant/components/nest/__init__.py b/homeassistant/components/nest/__init__.py index b0abd24012a..cd3f6ed9ed3 100644 --- a/homeassistant/components/nest/__init__.py +++ b/homeassistant/components/nest/__init__.py @@ -198,9 +198,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): hass.data[DOMAIN].pop(DATA_NEST_UNAVAILABLE, None) hass.data[DOMAIN][DATA_SUBSCRIBER] = subscriber - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -217,8 +217,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/nest/legacy/__init__.py b/homeassistant/components/nest/legacy/__init__.py index 218b01fd71b..11bc1ab33ff 100644 --- a/homeassistant/components/nest/legacy/__init__.py +++ b/homeassistant/components/nest/legacy/__init__.py @@ -28,6 +28,8 @@ from .const import DATA_NEST, DATA_NEST_CONFIG, DOMAIN, SIGNAL_NEST_UPDATE _CONFIGURING = {} _LOGGER = logging.getLogger(__name__) +PLATFORMS = ["climate", "camera", "sensor", "binary_sensor"] + # Configuration for the legacy nest API SERVICE_CANCEL_ETA = "cancel_eta" SERVICE_SET_ETA = "set_eta" @@ -131,9 +133,9 @@ async def async_setup_legacy_entry(hass, entry): if not await hass.async_add_executor_job(hass.data[DATA_NEST].initialize): return False - for component in "climate", "camera", "sensor", "binary_sensor": + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) def validate_structures(target_structures): diff --git a/homeassistant/components/netatmo/__init__.py b/homeassistant/components/netatmo/__init__.py index 5827486429a..d76133c91ab 100644 --- a/homeassistant/components/netatmo/__init__.py +++ b/homeassistant/components/netatmo/__init__.py @@ -111,9 +111,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): await data_handler.async_setup() hass.data[DOMAIN][entry.entry_id][DATA_HANDLER] = data_handler - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) async def unregister_webhook(_): @@ -214,8 +214,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/nexia/__init__.py b/homeassistant/components/nexia/__init__.py index fc2ef7fef35..4dde2084400 100644 --- a/homeassistant/components/nexia/__init__.py +++ b/homeassistant/components/nexia/__init__.py @@ -80,9 +80,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): UPDATE_COORDINATOR: coordinator, } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -93,8 +93,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/nextcloud/__init__.py b/homeassistant/components/nextcloud/__init__.py index 1a773040980..efa5b2e2f32 100644 --- a/homeassistant/components/nextcloud/__init__.py +++ b/homeassistant/components/nextcloud/__init__.py @@ -17,7 +17,7 @@ from homeassistant.helpers.event import track_time_interval _LOGGER = logging.getLogger(__name__) DOMAIN = "nextcloud" -NEXTCLOUD_COMPONENTS = ("sensor", "binary_sensor") +PLATFORMS = ("sensor", "binary_sensor") SCAN_INTERVAL = timedelta(seconds=60) # Validate user configuration @@ -116,8 +116,8 @@ def setup(hass, config): # Update sensors on time interval track_time_interval(hass, nextcloud_update, conf[CONF_SCAN_INTERVAL]) - for component in NEXTCLOUD_COMPONENTS: - discovery.load_platform(hass, component, DOMAIN, {}, config) + for platform in PLATFORMS: + discovery.load_platform(hass, platform, DOMAIN, {}, config) return True diff --git a/homeassistant/components/nightscout/__init__.py b/homeassistant/components/nightscout/__init__.py index 4c8ab756ddf..dfaaf28048e 100644 --- a/homeassistant/components/nightscout/__init__.py +++ b/homeassistant/components/nightscout/__init__.py @@ -48,9 +48,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): entry_type="service", ) - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -61,8 +61,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/nissan_leaf/__init__.py b/homeassistant/components/nissan_leaf/__init__.py index 6417926702d..bace7f14556 100644 --- a/homeassistant/components/nissan_leaf/__init__.py +++ b/homeassistant/components/nissan_leaf/__init__.py @@ -81,7 +81,7 @@ CONFIG_SCHEMA = vol.Schema( extra=vol.ALLOW_EXTRA, ) -LEAF_COMPONENTS = ["sensor", "switch", "binary_sensor"] +PLATFORMS = ["sensor", "switch", "binary_sensor"] SIGNAL_UPDATE_LEAF = "nissan_leaf_update" @@ -94,7 +94,7 @@ START_CHARGE_LEAF_SCHEMA = vol.Schema({vol.Required(ATTR_VIN): cv.string}) def setup(hass, config): - """Set up the Nissan Leaf component.""" + """Set up the Nissan Leaf integration.""" async def async_handle_update(service): """Handle service to update leaf data from Nissan servers.""" @@ -170,8 +170,8 @@ def setup(hass, config): data_store = LeafDataStore(hass, leaf, car_config) hass.data[DATA_LEAF][leaf.vin] = data_store - for component in LEAF_COMPONENTS: - load_platform(hass, component, DOMAIN, {}, car_config) + for platform in PLATFORMS: + load_platform(hass, platform, DOMAIN, {}, car_config) async_track_point_in_utc_time( hass, data_store.async_update_data, utcnow() + INITIAL_UPDATE diff --git a/homeassistant/components/nuheat/__init__.py b/homeassistant/components/nuheat/__init__.py index 2f51ae377a5..9fe4764e1af 100644 --- a/homeassistant/components/nuheat/__init__.py +++ b/homeassistant/components/nuheat/__init__.py @@ -80,9 +80,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): hass.data[DOMAIN][entry.entry_id] = (thermostat, coordinator) - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -93,8 +93,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/nuki/__init__.py b/homeassistant/components/nuki/__init__.py index 4af3e0d8ed4..6aa945a52bf 100644 --- a/homeassistant/components/nuki/__init__.py +++ b/homeassistant/components/nuki/__init__.py @@ -11,7 +11,7 @@ import homeassistant.helpers.config_validation as cv from .const import DEFAULT_PORT, DOMAIN -NUKI_PLATFORMS = ["lock"] +PLATFORMS = ["lock"] UPDATE_INTERVAL = timedelta(seconds=30) NUKI_SCHEMA = vol.Schema( @@ -29,7 +29,7 @@ async def async_setup(hass, config): """Set up the Nuki component.""" hass.data.setdefault(DOMAIN, {}) - for platform in NUKI_PLATFORMS: + for platform in PLATFORMS: confs = config.get(platform) if confs is None: continue diff --git a/homeassistant/components/nut/__init__.py b/homeassistant/components/nut/__init__.py index 5669b8a5c3b..3aba05ddd2b 100644 --- a/homeassistant/components/nut/__init__.py +++ b/homeassistant/components/nut/__init__.py @@ -101,9 +101,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): UNDO_UPDATE_LISTENER: undo_listener, } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -178,8 +178,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/nws/__init__.py b/homeassistant/components/nws/__init__.py index a0958be8d9e..83fca527d43 100644 --- a/homeassistant/components/nws/__init__.py +++ b/homeassistant/components/nws/__init__.py @@ -157,9 +157,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): await coordinator_forecast.async_refresh() await coordinator_forecast_hourly.async_refresh() - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -169,8 +169,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/nzbget/__init__.py b/homeassistant/components/nzbget/__init__.py index eba5eb58baf..57a741f0469 100644 --- a/homeassistant/components/nzbget/__init__.py +++ b/homeassistant/components/nzbget/__init__.py @@ -107,9 +107,9 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool DATA_UNDO_UPDATE_LISTENER: undo_listener, } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) _async_register_services(hass, coordinator) @@ -122,8 +122,8 @@ async def async_unload_entry(hass: HomeAssistantType, entry: ConfigEntry) -> boo unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/omnilogic/__init__.py b/homeassistant/components/omnilogic/__init__.py index ff4dd93a0e1..7196cd28cd7 100644 --- a/homeassistant/components/omnilogic/__init__.py +++ b/homeassistant/components/omnilogic/__init__.py @@ -66,9 +66,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): OMNI_API: api, } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -79,8 +79,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/ondilo_ico/__init__.py b/homeassistant/components/ondilo_ico/__init__.py index 69538c5e8b3..4dac83815ba 100644 --- a/homeassistant/components/ondilo_ico/__init__.py +++ b/homeassistant/components/ondilo_ico/__init__.py @@ -35,9 +35,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: hass.data[DOMAIN][entry.entry_id] = api.OndiloClient(hass, entry, implementation) - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -48,8 +48,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/onewire/__init__.py b/homeassistant/components/onewire/__init__.py index 6d64478aa72..779bc6dfd3a 100644 --- a/homeassistant/components/onewire/__init__.py +++ b/homeassistant/components/onewire/__init__.py @@ -5,7 +5,7 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.helpers.typing import HomeAssistantType -from .const import DOMAIN, SUPPORTED_PLATFORMS +from .const import DOMAIN, PLATFORMS from .onewirehub import CannotConnect, OneWireHub @@ -26,9 +26,9 @@ async def async_setup_entry(hass: HomeAssistantType, config_entry: ConfigEntry): hass.data[DOMAIN][config_entry.unique_id] = onewirehub - for component in SUPPORTED_PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) return True @@ -38,8 +38,8 @@ async def async_unload_entry(hass: HomeAssistantType, config_entry: ConfigEntry) unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in SUPPORTED_PLATFORMS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/onewire/const.py b/homeassistant/components/onewire/const.py index e68039078e9..54b18f7c905 100644 --- a/homeassistant/components/onewire/const.py +++ b/homeassistant/components/onewire/const.py @@ -61,7 +61,7 @@ SENSOR_TYPES = { SWITCH_TYPE_PIO: [None, None], } -SUPPORTED_PLATFORMS = [ +PLATFORMS = [ BINARY_SENSOR_DOMAIN, SENSOR_DOMAIN, SWITCH_DOMAIN, diff --git a/homeassistant/components/onvif/__init__.py b/homeassistant/components/onvif/__init__.py index b332b7a795a..0eb39064db7 100644 --- a/homeassistant/components/onvif/__init__.py +++ b/homeassistant/components/onvif/__init__.py @@ -88,9 +88,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): if device.capabilities.events: platforms += ["binary_sensor", "sensor"] - for component in platforms: + for platform in platforms: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, device.async_stop) @@ -111,8 +111,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): return all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in platforms + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in platforms ] ) ) diff --git a/homeassistant/components/openuv/__init__.py b/homeassistant/components/openuv/__init__.py index ce75365771d..387b7547514 100644 --- a/homeassistant/components/openuv/__init__.py +++ b/homeassistant/components/openuv/__init__.py @@ -69,9 +69,9 @@ async def async_setup_entry(hass, config_entry): LOGGER.error("Config entry failed: %s", err) raise ConfigEntryNotReady from err - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) @_verify_domain_control @@ -110,8 +110,8 @@ async def async_unload_entry(hass, config_entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/openweathermap/__init__.py b/homeassistant/components/openweathermap/__init__.py index 4754c4b2eff..82b1545e359 100644 --- a/homeassistant/components/openweathermap/__init__.py +++ b/homeassistant/components/openweathermap/__init__.py @@ -17,7 +17,6 @@ from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryNotReady from .const import ( - COMPONENTS, CONF_LANGUAGE, CONFIG_FLOW_VERSION, DOMAIN, @@ -25,6 +24,7 @@ from .const import ( ENTRY_WEATHER_COORDINATOR, FORECAST_MODE_FREE_DAILY, FORECAST_MODE_ONECALL_DAILY, + PLATFORMS, UPDATE_LISTENER, ) from .weather_update_coordinator import WeatherUpdateCoordinator @@ -65,9 +65,9 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry): ENTRY_WEATHER_COORDINATOR: weather_coordinator, } - for component in COMPONENTS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) update_listener = config_entry.add_update_listener(async_update_options) @@ -108,8 +108,8 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in COMPONENTS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/openweathermap/const.py b/homeassistant/components/openweathermap/const.py index c70afa9cab0..7c8e8aeee57 100644 --- a/homeassistant/components/openweathermap/const.py +++ b/homeassistant/components/openweathermap/const.py @@ -62,7 +62,7 @@ SENSOR_NAME = "sensor_name" SENSOR_UNIT = "sensor_unit" SENSOR_DEVICE_CLASS = "sensor_device_class" UPDATE_LISTENER = "update_listener" -COMPONENTS = ["sensor", "weather"] +PLATFORMS = ["sensor", "weather"] FORECAST_MODE_HOURLY = "hourly" FORECAST_MODE_DAILY = "daily" diff --git a/homeassistant/components/ozw/__init__.py b/homeassistant/components/ozw/__init__.py index a75c05416dc..3f54c731e39 100644 --- a/homeassistant/components/ozw/__init__.py +++ b/homeassistant/components/ozw/__init__.py @@ -267,8 +267,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): async def start_platforms(): await asyncio.gather( *[ - hass.config_entries.async_forward_entry_setup(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_setup(entry, platform) + for platform in PLATFORMS ] ) if entry.data.get(CONF_USE_ADDON): @@ -310,8 +310,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/panasonic_viera/__init__.py b/homeassistant/components/panasonic_viera/__init__.py index 9902d39a56c..449515802b9 100644 --- a/homeassistant/components/panasonic_viera/__init__.py +++ b/homeassistant/components/panasonic_viera/__init__.py @@ -104,9 +104,9 @@ async def async_setup_entry(hass, config_entry): data={**config, ATTR_DEVICE_INFO: device_info}, ) - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) return True @@ -117,8 +117,8 @@ async def async_unload_entry(hass, config_entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/philips_js/__init__.py b/homeassistant/components/philips_js/__init__.py index dd3e8d194e9..b3abaa28132 100644 --- a/homeassistant/components/philips_js/__init__.py +++ b/homeassistant/components/philips_js/__init__.py @@ -47,9 +47,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): await coordinator.async_refresh() hass.data[DOMAIN][entry.entry_id] = coordinator - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -60,8 +60,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/plugwise/gateway.py b/homeassistant/components/plugwise/gateway.py index c14395319d4..280de59898b 100644 --- a/homeassistant/components/plugwise/gateway.py +++ b/homeassistant/components/plugwise/gateway.py @@ -139,9 +139,9 @@ async def async_setup_entry_gw(hass: HomeAssistant, entry: ConfigEntry) -> bool: if single_master_thermostat is None: platforms = SENSOR_PLATFORMS - for component in platforms: + for platform in platforms: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -160,8 +160,8 @@ async def async_unload_entry_gw(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS_GATEWAY + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS_GATEWAY ] ) ) diff --git a/homeassistant/components/plum_lightpad/__init__.py b/homeassistant/components/plum_lightpad/__init__.py index 2a7ce4497bb..858f87e74f8 100644 --- a/homeassistant/components/plum_lightpad/__init__.py +++ b/homeassistant/components/plum_lightpad/__init__.py @@ -67,9 +67,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): hass.data.setdefault(DOMAIN, {}) hass.data[DOMAIN][entry.entry_id] = plum - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) def cleanup(event): diff --git a/homeassistant/components/point/__init__.py b/homeassistant/components/point/__init__.py index 13dce13c0da..a92f4f3f14f 100644 --- a/homeassistant/components/point/__init__.py +++ b/homeassistant/components/point/__init__.py @@ -39,6 +39,8 @@ _LOGGER = logging.getLogger(__name__) DATA_CONFIG_ENTRY_LOCK = "point_config_entry_lock" CONFIG_ENTRY_IS_SETUP = "point_config_entry_is_setup" +PLATFORMS = ["binary_sensor", "sensor"] + CONFIG_SCHEMA = vol.Schema( { DOMAIN: vol.Schema( @@ -137,8 +139,8 @@ async def async_unload_entry(hass: HomeAssistantType, entry: ConfigEntry): session = hass.data[DOMAIN].pop(entry.entry_id) await session.remove_webhook() - for component in ("binary_sensor", "sensor"): - await hass.config_entries.async_forward_entry_unload(entry, component) + for platform in PLATFORMS: + await hass.config_entries.async_forward_entry_unload(entry, platform) if not hass.data[DOMAIN]: hass.data.pop(DOMAIN) @@ -186,18 +188,18 @@ class MinutPointClient: async_dispatcher_send(self._hass, SIGNAL_UPDATE_ENTITY) return - async def new_device(device_id, component): + async def new_device(device_id, platform): """Load new device.""" - config_entries_key = f"{component}.{DOMAIN}" + config_entries_key = f"{platform}.{DOMAIN}" async with self._hass.data[DATA_CONFIG_ENTRY_LOCK]: if config_entries_key not in self._hass.data[CONFIG_ENTRY_IS_SETUP]: await self._hass.config_entries.async_forward_entry_setup( - self._config_entry, component + self._config_entry, platform ) self._hass.data[CONFIG_ENTRY_IS_SETUP].add(config_entries_key) async_dispatcher_send( - self._hass, POINT_DISCOVERY_NEW.format(component, DOMAIN), device_id + self._hass, POINT_DISCOVERY_NEW.format(platform, DOMAIN), device_id ) self._is_available = True @@ -207,8 +209,8 @@ class MinutPointClient: self._known_homes.add(home_id) for device in self._client.devices: if device.device_id not in self._known_devices: - for component in ("sensor", "binary_sensor"): - await new_device(device.device_id, component) + for platform in PLATFORMS: + await new_device(device.device_id, platform) self._known_devices.add(device.device_id) async_dispatcher_send(self._hass, SIGNAL_UPDATE_ENTITY) diff --git a/homeassistant/components/poolsense/__init__.py b/homeassistant/components/poolsense/__init__.py index 315816f4e1c..3dc9ace1b8f 100644 --- a/homeassistant/components/poolsense/__init__.py +++ b/homeassistant/components/poolsense/__init__.py @@ -56,9 +56,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): hass.data[DOMAIN][entry.entry_id] = coordinator - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -69,8 +69,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/powerwall/__init__.py b/homeassistant/components/powerwall/__init__.py index b392b713741..b529680da50 100644 --- a/homeassistant/components/powerwall/__init__.py +++ b/homeassistant/components/powerwall/__init__.py @@ -158,9 +158,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): await coordinator.async_refresh() - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -228,8 +228,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/progettihwsw/__init__.py b/homeassistant/components/progettihwsw/__init__.py index 02418c963d4..7597b2ff1a2 100644 --- a/homeassistant/components/progettihwsw/__init__.py +++ b/homeassistant/components/progettihwsw/__init__.py @@ -30,9 +30,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): # Check board validation again to load new values to API. await hass.data[DOMAIN][entry.entry_id].check_board() - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -43,8 +43,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/proxmoxve/__init__.py b/homeassistant/components/proxmoxve/__init__.py index 2f42ca8fe9e..663afc69b1d 100644 --- a/homeassistant/components/proxmoxve/__init__.py +++ b/homeassistant/components/proxmoxve/__init__.py @@ -187,10 +187,10 @@ async def async_setup(hass: HomeAssistant, config: dict): # Fetch initial data await coordinator.async_refresh() - for component in PLATFORMS: + for platform in PLATFORMS: await hass.async_create_task( hass.helpers.discovery.async_load_platform( - component, DOMAIN, {"config": config}, config + platform, DOMAIN, {"config": config}, config ) ) diff --git a/homeassistant/components/rachio/__init__.py b/homeassistant/components/rachio/__init__.py index 672ff272344..30015dcf8c1 100644 --- a/homeassistant/components/rachio/__init__.py +++ b/homeassistant/components/rachio/__init__.py @@ -21,7 +21,7 @@ from .webhooks import ( _LOGGER = logging.getLogger(__name__) -SUPPORTED_DOMAINS = ["switch", "binary_sensor"] +PLATFORMS = ["switch", "binary_sensor"] CONFIG_SCHEMA = cv.deprecated(DOMAIN) @@ -39,8 +39,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in SUPPORTED_DOMAINS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) @@ -99,13 +99,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): webhook_url, ) - # Enable component + # Enable platform hass.data[DOMAIN][entry.entry_id] = person async_register_webhook(hass, webhook_id, entry.entry_id) - for component in SUPPORTED_DOMAINS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True diff --git a/homeassistant/components/rainbird/__init__.py b/homeassistant/components/rainbird/__init__.py index 83c358c480b..d8334470b60 100644 --- a/homeassistant/components/rainbird/__init__.py +++ b/homeassistant/components/rainbird/__init__.py @@ -16,7 +16,7 @@ import homeassistant.helpers.config_validation as cv CONF_ZONES = "zones" -SUPPORTED_PLATFORMS = [switch.DOMAIN, sensor.DOMAIN, binary_sensor.DOMAIN] +PLATFORMS = [switch.DOMAIN, sensor.DOMAIN, binary_sensor.DOMAIN] _LOGGER = logging.getLogger(__name__) @@ -80,7 +80,7 @@ def _setup_controller(hass, controller_config, config): return False hass.data[DATA_RAINBIRD].append(controller) _LOGGER.debug("Rain Bird Controller %d set to: %s", position, server) - for platform in SUPPORTED_PLATFORMS: + for platform in PLATFORMS: discovery.load_platform( hass, platform, diff --git a/homeassistant/components/rainmachine/__init__.py b/homeassistant/components/rainmachine/__init__.py index 98fbdbcf401..b4d8510cc77 100644 --- a/homeassistant/components/rainmachine/__init__.py +++ b/homeassistant/components/rainmachine/__init__.py @@ -155,9 +155,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: await asyncio.gather(*controller_init_tasks) - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) hass.data[DOMAIN][DATA_LISTENER] = entry.add_update_listener(async_reload_entry) @@ -170,8 +170,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/recollect_waste/__init__.py b/homeassistant/components/recollect_waste/__init__.py index 0600d73d8a1..0d6961831d8 100644 --- a/homeassistant/components/recollect_waste/__init__.py +++ b/homeassistant/components/recollect_waste/__init__.py @@ -61,9 +61,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: hass.data[DOMAIN][DATA_COORDINATOR][entry.entry_id] = coordinator - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) hass.data[DOMAIN][DATA_LISTENER][entry.entry_id] = entry.add_update_listener( @@ -83,8 +83,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/rfxtrx/__init__.py b/homeassistant/components/rfxtrx/__init__.py index 5952cb62a71..c9e8c0dee75 100644 --- a/homeassistant/components/rfxtrx/__init__.py +++ b/homeassistant/components/rfxtrx/__init__.py @@ -151,7 +151,7 @@ CONFIG_SCHEMA = vol.Schema( extra=vol.ALLOW_EXTRA, ) -DOMAINS = ["switch", "sensor", "light", "binary_sensor", "cover"] +PLATFORMS = ["switch", "sensor", "light", "binary_sensor", "cover"] async def async_setup(hass, config): @@ -202,9 +202,9 @@ async def async_setup_entry(hass, entry: config_entries.ConfigEntry): ) return False - for domain in DOMAINS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, domain) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -215,8 +215,8 @@ async def async_unload_entry(hass, entry: config_entries.ConfigEntry): if not all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in DOMAINS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ): diff --git a/homeassistant/components/ring/__init__.py b/homeassistant/components/ring/__init__.py index ed22575bccc..a4d005d3c44 100644 --- a/homeassistant/components/ring/__init__.py +++ b/homeassistant/components/ring/__init__.py @@ -99,9 +99,9 @@ async def async_setup_entry(hass, entry): ), } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) if hass.services.has_service(DOMAIN, "update"): @@ -126,8 +126,8 @@ async def async_unload_entry(hass, entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/risco/__init__.py b/homeassistant/components/risco/__init__.py index 685fee43adf..f5ebc4e13ef 100644 --- a/homeassistant/components/risco/__init__.py +++ b/homeassistant/components/risco/__init__.py @@ -63,8 +63,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): async def start_platforms(): await asyncio.gather( *[ - hass.config_entries.async_forward_entry_setup(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_setup(entry, platform) + for platform in PLATFORMS ] ) await events_coordinator.async_refresh() @@ -79,8 +79,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/rituals_perfume_genie/__init__.py b/homeassistant/components/rituals_perfume_genie/__init__.py index ba11206d496..f2fd13a9ef4 100644 --- a/homeassistant/components/rituals_perfume_genie/__init__.py +++ b/homeassistant/components/rituals_perfume_genie/__init__.py @@ -37,9 +37,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): hass.data.setdefault(DOMAIN, {})[entry.entry_id] = account - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -50,8 +50,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/roku/__init__.py b/homeassistant/components/roku/__init__.py index a75fc813fb9..06e8d0ae848 100644 --- a/homeassistant/components/roku/__init__.py +++ b/homeassistant/components/roku/__init__.py @@ -54,9 +54,9 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool hass.data[DOMAIN][entry.entry_id] = coordinator - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -67,8 +67,8 @@ async def async_unload_entry(hass: HomeAssistantType, entry: ConfigEntry) -> boo unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/roomba/__init__.py b/homeassistant/components/roomba/__init__.py index 658c230c3a7..6de775e1d99 100644 --- a/homeassistant/components/roomba/__init__.py +++ b/homeassistant/components/roomba/__init__.py @@ -8,7 +8,7 @@ from roombapy import Roomba, RoombaConnectionError from homeassistant import exceptions from homeassistant.const import CONF_DELAY, CONF_HOST, CONF_NAME, CONF_PASSWORD -from .const import BLID, COMPONENTS, CONF_BLID, CONF_CONTINUOUS, DOMAIN, ROOMBA_SESSION +from .const import BLID, CONF_BLID, CONF_CONTINUOUS, DOMAIN, PLATFORMS, ROOMBA_SESSION _LOGGER = logging.getLogger(__name__) @@ -51,9 +51,9 @@ async def async_setup_entry(hass, config_entry): BLID: config_entry.data[CONF_BLID], } - for component in COMPONENTS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) if not config_entry.update_listeners: @@ -105,8 +105,8 @@ async def async_unload_entry(hass, config_entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in COMPONENTS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/roomba/const.py b/homeassistant/components/roomba/const.py index 2ffb34eb7c8..0509cd92116 100644 --- a/homeassistant/components/roomba/const.py +++ b/homeassistant/components/roomba/const.py @@ -1,6 +1,6 @@ """The roomba constants.""" DOMAIN = "roomba" -COMPONENTS = ["sensor", "binary_sensor", "vacuum"] +PLATFORMS = ["sensor", "binary_sensor", "vacuum"] CONF_CERT = "certificate" CONF_CONTINUOUS = "continuous" CONF_BLID = "blid" diff --git a/homeassistant/components/ruckus_unleashed/__init__.py b/homeassistant/components/ruckus_unleashed/__init__.py index ed38f5a2a3a..2bab1747f0f 100644 --- a/homeassistant/components/ruckus_unleashed/__init__.py +++ b/homeassistant/components/ruckus_unleashed/__init__.py @@ -84,8 +84,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/sense/__init__.py b/homeassistant/components/sense/__init__.py index 2d6c0c41e5b..1689d8c4834 100644 --- a/homeassistant/components/sense/__init__.py +++ b/homeassistant/components/sense/__init__.py @@ -139,9 +139,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): SENSE_DISCOVERED_DEVICES_DATA: sense_discovered_devices, } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) async def async_sense_update(_): @@ -169,8 +169,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/sharkiq/__init__.py b/homeassistant/components/sharkiq/__init__.py index b7684f98855..e43338cd5b0 100644 --- a/homeassistant/components/sharkiq/__init__.py +++ b/homeassistant/components/sharkiq/__init__.py @@ -14,7 +14,7 @@ from sharkiqpy import ( from homeassistant import exceptions from homeassistant.const import CONF_PASSWORD, CONF_USERNAME -from .const import _LOGGER, API_TIMEOUT, COMPONENTS, DOMAIN +from .const import _LOGGER, API_TIMEOUT, DOMAIN, PLATFORMS from .update_coordinator import SharkIqUpdateCoordinator @@ -70,9 +70,9 @@ async def async_setup_entry(hass, config_entry): hass.data[DOMAIN][config_entry.entry_id] = coordinator - for component in COMPONENTS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) return True @@ -98,8 +98,8 @@ async def async_unload_entry(hass, config_entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in COMPONENTS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/sharkiq/const.py b/homeassistant/components/sharkiq/const.py index e0feb306f77..8f4c56b65db 100644 --- a/homeassistant/components/sharkiq/const.py +++ b/homeassistant/components/sharkiq/const.py @@ -5,7 +5,7 @@ import logging _LOGGER = logging.getLogger(__package__) API_TIMEOUT = 20 -COMPONENTS = ["vacuum"] +PLATFORMS = ["vacuum"] DOMAIN = "sharkiq" SHARK = "Shark" UPDATE_INTERVAL = timedelta(seconds=30) diff --git a/homeassistant/components/shelly/__init__.py b/homeassistant/components/shelly/__init__.py index ccb52127525..52dae7f164d 100644 --- a/homeassistant/components/shelly/__init__.py +++ b/homeassistant/components/shelly/__init__.py @@ -134,9 +134,9 @@ async def async_device_setup( ] = ShellyDeviceRestWrapper(hass, device) platforms = PLATFORMS - for component in platforms: + for platform in platforms: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) @@ -323,8 +323,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in platforms + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in platforms ] ) ) diff --git a/homeassistant/components/simplisafe/__init__.py b/homeassistant/components/simplisafe/__init__.py index 495ba29fefb..a6d95e1d9af 100644 --- a/homeassistant/components/simplisafe/__init__.py +++ b/homeassistant/components/simplisafe/__init__.py @@ -71,7 +71,7 @@ EVENT_SIMPLISAFE_NOTIFICATION = "SIMPLISAFE_NOTIFICATION" DEFAULT_SOCKET_MIN_RETRY = 15 -SUPPORTED_PLATFORMS = ( +PLATFORMS = ( "alarm_control_panel", "binary_sensor", "lock", @@ -219,7 +219,7 @@ async def async_setup_entry(hass, config_entry): ) await simplisafe.async_init() - for platform in SUPPORTED_PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( hass.config_entries.async_forward_entry_setup(config_entry, platform) ) @@ -327,8 +327,8 @@ async def async_unload_entry(hass, entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in SUPPORTED_PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/smappee/__init__.py b/homeassistant/components/smappee/__init__.py index aed67c5c167..f803f38b8ea 100644 --- a/homeassistant/components/smappee/__init__.py +++ b/homeassistant/components/smappee/__init__.py @@ -21,7 +21,7 @@ from .const import ( CONF_SERIALNUMBER, DOMAIN, MIN_TIME_BETWEEN_UPDATES, - SMAPPEE_PLATFORMS, + PLATFORMS, TOKEN_URL, ) @@ -92,9 +92,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): hass.data[DOMAIN][entry.entry_id] = SmappeeBase(hass, smappee) - for component in SMAPPEE_PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -105,8 +105,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in SMAPPEE_PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/smappee/const.py b/homeassistant/components/smappee/const.py index 2c69f1ccb96..fc059509ced 100644 --- a/homeassistant/components/smappee/const.py +++ b/homeassistant/components/smappee/const.py @@ -12,7 +12,7 @@ CONF_TITLE = "title" ENV_CLOUD = "cloud" ENV_LOCAL = "local" -SMAPPEE_PLATFORMS = ["binary_sensor", "sensor", "switch"] +PLATFORMS = ["binary_sensor", "sensor", "switch"] SUPPORTED_LOCAL_DEVICES = ("Smappee1", "Smappee2") diff --git a/homeassistant/components/smart_meter_texas/__init__.py b/homeassistant/components/smart_meter_texas/__init__.py index 7b1c6cfa9b7..3180248fcd1 100644 --- a/homeassistant/components/smart_meter_texas/__init__.py +++ b/homeassistant/components/smart_meter_texas/__init__.py @@ -83,9 +83,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): asyncio.create_task(coordinator.async_refresh()) - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -122,8 +122,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/smarthab/__init__.py b/homeassistant/components/smarthab/__init__.py index c826b5d8f4d..c259ef71aab 100644 --- a/homeassistant/components/smarthab/__init__.py +++ b/homeassistant/components/smarthab/__init__.py @@ -13,7 +13,7 @@ from homeassistant.helpers.typing import HomeAssistantType DOMAIN = "smarthab" DATA_HUB = "hub" -COMPONENTS = ["light", "cover"] +PLATFORMS = ["light", "cover"] _LOGGER = logging.getLogger(__name__) @@ -69,9 +69,9 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry): # Pass hub object to child platforms hass.data[DOMAIN][entry.entry_id] = {DATA_HUB: hub} - for component in COMPONENTS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -83,8 +83,8 @@ async def async_unload_entry(hass: HomeAssistantType, entry: ConfigEntry): result = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in COMPONENTS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/smartthings/__init__.py b/homeassistant/components/smartthings/__init__.py index d184a3ca6ce..77ef913c629 100644 --- a/homeassistant/components/smartthings/__init__.py +++ b/homeassistant/components/smartthings/__init__.py @@ -36,8 +36,8 @@ from .const import ( DATA_MANAGER, DOMAIN, EVENT_BUTTON, + PLATFORMS, SIGNAL_SMARTTHINGS_UPDATE, - SUPPORTED_PLATFORMS, TOKEN_REFRESH_INTERVAL, ) from .smartapp import ( @@ -184,9 +184,9 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry): ) return False - for component in SUPPORTED_PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -213,8 +213,8 @@ async def async_unload_entry(hass: HomeAssistantType, entry: ConfigEntry): broker.disconnect() tasks = [ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in SUPPORTED_PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] return all(await asyncio.gather(*tasks)) @@ -293,11 +293,13 @@ class DeviceBroker: for device in devices: capabilities = device.capabilities.copy() slots = {} - for platform_name in SUPPORTED_PLATFORMS: - platform = importlib.import_module(f".{platform_name}", self.__module__) - if not hasattr(platform, "get_capabilities"): + for platform in PLATFORMS: + platform_module = importlib.import_module( + f".{platform}", self.__module__ + ) + if not hasattr(platform_module, "get_capabilities"): continue - assigned = platform.get_capabilities(capabilities) + assigned = platform_module.get_capabilities(capabilities) if not assigned: continue # Draw-down capabilities and set slot assignment @@ -305,7 +307,7 @@ class DeviceBroker: if capability not in capabilities: continue capabilities.remove(capability) - slots[capability] = platform_name + slots[capability] = platform assignments[device.device_id] = slots return assignments diff --git a/homeassistant/components/smartthings/const.py b/homeassistant/components/smartthings/const.py index 03188411f07..a7aa9066dd2 100644 --- a/homeassistant/components/smartthings/const.py +++ b/homeassistant/components/smartthings/const.py @@ -31,7 +31,7 @@ STORAGE_VERSION = 1 # Ordered 'specific to least-specific platform' in order for capabilities # to be drawn-down and represented by the most appropriate platform. -SUPPORTED_PLATFORMS = [ +PLATFORMS = [ "climate", "fan", "light", diff --git a/homeassistant/components/sms/__init__.py b/homeassistant/components/sms/__init__.py index 8752dfd90da..c4fdb38ebaa 100644 --- a/homeassistant/components/sms/__init__.py +++ b/homeassistant/components/sms/__init__.py @@ -46,9 +46,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): if not gateway: return False hass.data[DOMAIN][SMS_GATEWAY] = gateway - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -59,8 +59,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/soma/__init__.py b/homeassistant/components/soma/__init__.py index bd5695cb7ec..3f15199c162 100644 --- a/homeassistant/components/soma/__init__.py +++ b/homeassistant/components/soma/__init__.py @@ -24,7 +24,7 @@ CONFIG_SCHEMA = vol.Schema( extra=vol.ALLOW_EXTRA, ) -SOMA_COMPONENTS = ["cover", "sensor"] +PLATFORMS = ["cover", "sensor"] async def async_setup(hass, config): @@ -50,9 +50,9 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry): devices = await hass.async_add_executor_job(hass.data[DOMAIN][API].list_devices) hass.data[DOMAIN][DEVICES] = devices["shades"] - for component in SOMA_COMPONENTS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -63,8 +63,8 @@ async def async_unload_entry(hass: HomeAssistantType, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in SOMA_COMPONENTS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/somfy/__init__.py b/homeassistant/components/somfy/__init__.py index ac32b9d5379..0a83ac2fc52 100644 --- a/homeassistant/components/somfy/__init__.py +++ b/homeassistant/components/somfy/__init__.py @@ -48,7 +48,7 @@ CONFIG_SCHEMA = vol.Schema( extra=vol.ALLOW_EXTRA, ) -SOMFY_COMPONENTS = ["climate", "cover", "sensor", "switch"] +PLATFORMS = ["climate", "cover", "sensor", "switch"] async def async_setup(hass, config): @@ -134,9 +134,9 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry): model=hub.type, ) - for component in SOMFY_COMPONENTS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -147,8 +147,8 @@ async def async_unload_entry(hass: HomeAssistantType, entry: ConfigEntry): hass.data[DOMAIN].pop(API, None) await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in SOMFY_COMPONENTS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) return True diff --git a/homeassistant/components/somfy_mylink/__init__.py b/homeassistant/components/somfy_mylink/__init__.py index d371fd96310..a2ade387c01 100644 --- a/homeassistant/components/somfy_mylink/__init__.py +++ b/homeassistant/components/somfy_mylink/__init__.py @@ -23,7 +23,7 @@ from .const import ( DEFAULT_PORT, DOMAIN, MYLINK_STATUS, - SOMFY_MYLINK_COMPONENTS, + PLATFORMS, ) CONFIG_OPTIONS = (CONF_DEFAULT_REVERSE, CONF_ENTITY_CONFIG) @@ -121,9 +121,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): UNDO_UPDATE_LISTENER: undo_listener, } - for component in SOMFY_MYLINK_COMPONENTS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -182,8 +182,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in SOMFY_MYLINK_COMPONENTS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/somfy_mylink/const.py b/homeassistant/components/somfy_mylink/const.py index a7cbf864cd9..bf58ee1af92 100644 --- a/homeassistant/components/somfy_mylink/const.py +++ b/homeassistant/components/somfy_mylink/const.py @@ -14,6 +14,6 @@ DATA_SOMFY_MYLINK = "somfy_mylink_data" MYLINK_STATUS = "mylink_status" DOMAIN = "somfy_mylink" -SOMFY_MYLINK_COMPONENTS = ["cover"] +PLATFORMS = ["cover"] MANUFACTURER = "Somfy" diff --git a/homeassistant/components/sonarr/__init__.py b/homeassistant/components/sonarr/__init__.py index 3e2a5498c55..636653dad00 100644 --- a/homeassistant/components/sonarr/__init__.py +++ b/homeassistant/components/sonarr/__init__.py @@ -84,9 +84,9 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool DATA_UNDO_UPDATE_LISTENER: undo_listener, } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -97,8 +97,8 @@ async def async_unload_entry(hass: HomeAssistantType, entry: ConfigEntry) -> boo unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/spider/__init__.py b/homeassistant/components/spider/__init__.py index b0c34ae5a08..d9ccdfd248a 100644 --- a/homeassistant/components/spider/__init__.py +++ b/homeassistant/components/spider/__init__.py @@ -66,9 +66,9 @@ async def async_setup_entry(hass, entry): hass.data[DOMAIN][entry.entry_id] = api - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -79,8 +79,8 @@ async def async_unload_entry(hass, entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/streamlabswater/__init__.py b/homeassistant/components/streamlabswater/__init__.py index 336e92358ee..0a49e128c2f 100644 --- a/homeassistant/components/streamlabswater/__init__.py +++ b/homeassistant/components/streamlabswater/__init__.py @@ -17,7 +17,7 @@ SERVICE_SET_AWAY_MODE = "set_away_mode" AWAY_MODE_AWAY = "away" AWAY_MODE_HOME = "home" -STREAMLABSWATER_COMPONENTS = ["sensor", "binary_sensor"] +PLATFORMS = ["sensor", "binary_sensor"] CONF_LOCATION_ID = "location_id" @@ -39,7 +39,7 @@ SET_AWAY_MODE_SCHEMA = vol.Schema( def setup(hass, config): - """Set up the streamlabs water component.""" + """Set up the streamlabs water integration.""" conf = config[DOMAIN] api_key = conf.get(CONF_API_KEY) @@ -74,8 +74,8 @@ def setup(hass, config): "location_name": location_name, } - for component in STREAMLABSWATER_COMPONENTS: - discovery.load_platform(hass, component, DOMAIN, {}, config) + for platform in PLATFORMS: + discovery.load_platform(hass, platform, DOMAIN, {}, config) def set_away_mode(service): """Set the StreamLabsWater Away Mode.""" diff --git a/homeassistant/components/subaru/__init__.py b/homeassistant/components/subaru/__init__.py index 63bc644b50a..04f61111671 100644 --- a/homeassistant/components/subaru/__init__.py +++ b/homeassistant/components/subaru/__init__.py @@ -22,7 +22,7 @@ from .const import ( ENTRY_COORDINATOR, ENTRY_VEHICLES, FETCH_INTERVAL, - SUPPORTED_PLATFORMS, + PLATFORMS, UPDATE_INTERVAL, VEHICLE_API_GEN, VEHICLE_HAS_EV, @@ -94,9 +94,9 @@ async def async_setup_entry(hass, entry): ENTRY_VEHICLES: vehicle_info, } - for component in SUPPORTED_PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -107,8 +107,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in SUPPORTED_PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/subaru/const.py b/homeassistant/components/subaru/const.py index 7349f9c32d6..fa6fe984e61 100644 --- a/homeassistant/components/subaru/const.py +++ b/homeassistant/components/subaru/const.py @@ -30,7 +30,7 @@ API_GEN_1 = "g1" API_GEN_2 = "g2" MANUFACTURER = "Subaru Corp." -SUPPORTED_PLATFORMS = [ +PLATFORMS = [ "sensor", ] diff --git a/homeassistant/components/tado/__init__.py b/homeassistant/components/tado/__init__.py index c7fb180e6d8..36af3bb0dba 100644 --- a/homeassistant/components/tado/__init__.py +++ b/homeassistant/components/tado/__init__.py @@ -31,7 +31,7 @@ from .const import ( _LOGGER = logging.getLogger(__name__) -TADO_COMPONENTS = ["binary_sensor", "sensor", "climate", "water_heater"] +PLATFORMS = ["binary_sensor", "sensor", "climate", "water_heater"] MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=4) SCAN_INTERVAL = timedelta(minutes=5) @@ -92,9 +92,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): UPDATE_LISTENER: update_listener, } - for component in TADO_COMPONENTS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -118,8 +118,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in TADO_COMPONENTS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/tahoma/__init__.py b/homeassistant/components/tahoma/__init__.py index d75ccaec414..b322d454002 100644 --- a/homeassistant/components/tahoma/__init__.py +++ b/homeassistant/components/tahoma/__init__.py @@ -31,7 +31,7 @@ CONFIG_SCHEMA = vol.Schema( extra=vol.ALLOW_EXTRA, ) -TAHOMA_COMPONENTS = ["binary_sensor", "cover", "lock", "scene", "sensor", "switch"] +PLATFORMS = ["binary_sensor", "cover", "lock", "scene", "sensor", "switch"] TAHOMA_TYPES = { "io:AwningValanceIOComponent": "cover", @@ -73,7 +73,7 @@ TAHOMA_TYPES = { def setup(hass, config): - """Activate Tahoma component.""" + """Set up Tahoma integration.""" conf = config[DOMAIN] username = conf.get(CONF_USERNAME) @@ -111,14 +111,14 @@ def setup(hass, config): for scene in scenes: hass.data[DOMAIN]["scenes"].append(scene) - for component in TAHOMA_COMPONENTS: - discovery.load_platform(hass, component, DOMAIN, {}, config) + for platform in PLATFORMS: + discovery.load_platform(hass, platform, DOMAIN, {}, config) return True def map_tahoma_device(tahoma_device): - """Map Tahoma device types to Home Assistant components.""" + """Map Tahoma device types to Home Assistant platforms.""" return TAHOMA_TYPES.get(tahoma_device.type) diff --git a/homeassistant/components/tasmota/__init__.py b/homeassistant/components/tasmota/__init__.py index c0ebae7695e..0b42725cdcf 100644 --- a/homeassistant/components/tasmota/__init__.py +++ b/homeassistant/components/tasmota/__init__.py @@ -92,8 +92,8 @@ async def async_setup_entry(hass, entry): await device_automation.async_setup_entry(hass, entry) await asyncio.gather( *[ - hass.config_entries.async_forward_entry_setup(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_setup(entry, platform) + for platform in PLATFORMS ] ) @@ -113,8 +113,8 @@ async def async_unload_entry(hass, entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) @@ -128,8 +128,8 @@ async def async_unload_entry(hass, entry): for unsub in hass.data[DATA_UNSUB]: unsub() hass.data.pop(DATA_REMOVE_DISCOVER_COMPONENT.format("device_automation"))() - for component in PLATFORMS: - hass.data.pop(DATA_REMOVE_DISCOVER_COMPONENT.format(component))() + for platform in PLATFORMS: + hass.data.pop(DATA_REMOVE_DISCOVER_COMPONENT.format(platform))() # deattach device triggers device_registry = await hass.helpers.device_registry.async_get_registry() diff --git a/homeassistant/components/tellduslive/__init__.py b/homeassistant/components/tellduslive/__init__.py index 5d4721e60e6..70cc8848814 100644 --- a/homeassistant/components/tellduslive/__init__.py +++ b/homeassistant/components/tellduslive/__init__.py @@ -123,8 +123,8 @@ async def async_unload_entry(hass, config_entry): interval_tracker() await asyncio.wait( [ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in hass.data.pop(CONFIG_ENTRY_IS_SETUP) + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in hass.data.pop(CONFIG_ENTRY_IS_SETUP) ] ) del hass.data[DOMAIN] diff --git a/homeassistant/components/tesla/__init__.py b/homeassistant/components/tesla/__init__.py index b31f8ae6dd3..a2ed908948f 100644 --- a/homeassistant/components/tesla/__init__.py +++ b/homeassistant/components/tesla/__init__.py @@ -39,7 +39,7 @@ from .const import ( DOMAIN, ICONS, MIN_SCAN_INTERVAL, - TESLA_COMPONENTS, + PLATFORMS, ) _LOGGER = logging.getLogger(__name__) @@ -190,10 +190,10 @@ async def async_setup_entry(hass, config_entry): for device in all_devices: entry_data["devices"][device.hass_type].append(device) - for component in TESLA_COMPONENTS: - _LOGGER.debug("Loading %s", component) + for platform in PLATFORMS: + _LOGGER.debug("Loading %s", platform) hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) return True @@ -203,8 +203,8 @@ async def async_unload_entry(hass, config_entry) -> bool: unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in TESLA_COMPONENTS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/tesla/const.py b/homeassistant/components/tesla/const.py index 2b8485c7616..94883e4a833 100644 --- a/homeassistant/components/tesla/const.py +++ b/homeassistant/components/tesla/const.py @@ -5,7 +5,8 @@ DATA_LISTENER = "listener" DEFAULT_SCAN_INTERVAL = 660 DEFAULT_WAKE_ON_START = False MIN_SCAN_INTERVAL = 60 -TESLA_COMPONENTS = [ + +PLATFORMS = [ "sensor", "lock", "climate", @@ -13,6 +14,7 @@ TESLA_COMPONENTS = [ "device_tracker", "switch", ] + ICONS = { "battery sensor": "mdi:battery", "range sensor": "mdi:gauge", diff --git a/homeassistant/components/tibber/__init__.py b/homeassistant/components/tibber/__init__.py index b4b29a84297..fd7fc389c75 100644 --- a/homeassistant/components/tibber/__init__.py +++ b/homeassistant/components/tibber/__init__.py @@ -73,9 +73,9 @@ async def async_setup_entry(hass, entry): _LOGGER.error("Failed to login. %s", exp) return False - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) # set up notify platform, no entry support for notify component yet, @@ -93,8 +93,8 @@ async def async_unload_entry(hass, config_entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/tile/__init__.py b/homeassistant/components/tile/__init__.py index 205742017d3..48bf8177c63 100644 --- a/homeassistant/components/tile/__init__.py +++ b/homeassistant/components/tile/__init__.py @@ -74,9 +74,9 @@ async def async_setup_entry(hass, entry): await gather_with_concurrency(DEFAULT_INIT_TASK_LIMIT, *coordinator_init_tasks) - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -87,8 +87,8 @@ async def async_unload_entry(hass, entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/toon/__init__.py b/homeassistant/components/toon/__init__.py index d1753ad4d02..2a3322991e1 100644 --- a/homeassistant/components/toon/__init__.py +++ b/homeassistant/components/toon/__init__.py @@ -27,7 +27,7 @@ from .const import CONF_AGREEMENT_ID, CONF_MIGRATE, DEFAULT_SCAN_INTERVAL, DOMAI from .coordinator import ToonDataUpdateCoordinator from .oauth2 import register_oauth2_implementations -ENTITY_COMPONENTS = { +PLATFORMS = { BINARY_SENSOR_DOMAIN, CLIMATE_DOMAIN, SENSOR_DOMAIN, @@ -119,9 +119,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: ) # Spin up the platforms - for component in ENTITY_COMPONENTS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) # If Home Assistant is already in a running state, register the webhook @@ -146,8 +146,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: unload_ok = all( await asyncio.gather( *( - hass.config_entries.async_forward_entry_unload(entry, component) - for component in ENTITY_COMPONENTS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ) ) ) diff --git a/homeassistant/components/totalconnect/__init__.py b/homeassistant/components/totalconnect/__init__.py index 179d60b794a..8ef223c49a5 100644 --- a/homeassistant/components/totalconnect/__init__.py +++ b/homeassistant/components/totalconnect/__init__.py @@ -82,9 +82,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): hass.data[DOMAIN][entry.entry_id] = client - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True diff --git a/homeassistant/components/tradfri/__init__.py b/homeassistant/components/tradfri/__init__.py index 4c984067ada..3323c54d9c2 100644 --- a/homeassistant/components/tradfri/__init__.py +++ b/homeassistant/components/tradfri/__init__.py @@ -148,9 +148,9 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry): sw_version=gateway_info.firmware_version, ) - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) async def async_keep_alive(now): @@ -174,8 +174,8 @@ async def async_unload_entry(hass: HomeAssistantType, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/tuya/__init__.py b/homeassistant/components/tuya/__init__.py index 7f6ba6b26fd..1f16d131e39 100644 --- a/homeassistant/components/tuya/__init__.py +++ b/homeassistant/components/tuya/__init__.py @@ -240,9 +240,9 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): await asyncio.gather( *[ hass.config_entries.async_forward_entry_unload( - entry, component.split(".", 1)[0] + entry, platform.split(".", 1)[0] ) - for component in hass.data[DOMAIN][ENTRY_IS_SETUP] + for platform in hass.data[DOMAIN][ENTRY_IS_SETUP] ] ) ) diff --git a/homeassistant/components/unifi/controller.py b/homeassistant/components/unifi/controller.py index 128f0107984..45268a341e1 100644 --- a/homeassistant/components/unifi/controller.py +++ b/homeassistant/components/unifi/controller.py @@ -73,7 +73,7 @@ from .errors import AuthenticationRequired, CannotConnect RETRY_TIMER = 15 CHECK_HEARTBEAT_INTERVAL = timedelta(seconds=1) -SUPPORTED_PLATFORMS = [TRACKER_DOMAIN, SENSOR_DOMAIN, SWITCH_DOMAIN] +PLATFORMS = [TRACKER_DOMAIN, SENSOR_DOMAIN, SWITCH_DOMAIN] CLIENT_CONNECTED = ( WIRED_CLIENT_CONNECTED, @@ -368,7 +368,7 @@ class UniFiController: self.wireless_clients = wireless_clients.get_data(self.config_entry) self.update_wireless_clients() - for platform in SUPPORTED_PLATFORMS: + for platform in PLATFORMS: self.hass.async_create_task( self.hass.config_entries.async_forward_entry_setup( self.config_entry, platform @@ -465,7 +465,7 @@ class UniFiController: self.hass.config_entries.async_forward_entry_unload( self.config_entry, platform ) - for platform in SUPPORTED_PLATFORMS + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/upb/__init__.py b/homeassistant/components/upb/__init__.py index f2765ff317d..70f37451e6b 100644 --- a/homeassistant/components/upb/__init__.py +++ b/homeassistant/components/upb/__init__.py @@ -17,7 +17,7 @@ from .const import ( EVENT_UPB_SCENE_CHANGED, ) -UPB_PLATFORMS = ["light", "scene"] +PLATFORMS = ["light", "scene"] async def async_setup(hass: HomeAssistant, hass_config: ConfigType) -> bool: @@ -36,9 +36,9 @@ async def async_setup_entry(hass, config_entry): hass.data.setdefault(DOMAIN, {}) hass.data[DOMAIN][config_entry.entry_id] = {"upb": upb} - for component in UPB_PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) def _element_changed(element, changeset): @@ -71,8 +71,8 @@ async def async_unload_entry(hass, config_entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in UPB_PLATFORMS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/velbus/__init__.py b/homeassistant/components/velbus/__init__.py index a859567e219..a15b0a641ef 100644 --- a/homeassistant/components/velbus/__init__.py +++ b/homeassistant/components/velbus/__init__.py @@ -22,7 +22,7 @@ CONFIG_SCHEMA = vol.Schema( {DOMAIN: vol.Schema({vol.Required(CONF_PORT): cv.string})}, extra=vol.ALLOW_EXTRA ) -COMPONENT_TYPES = ["switch", "sensor", "binary_sensor", "cover", "climate", "light"] +PLATFORMS = ["switch", "sensor", "binary_sensor", "cover", "climate", "light"] async def async_setup(hass, config): @@ -51,19 +51,19 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry): def callback(): modules = controller.get_modules() discovery_info = {"cntrl": controller} - for category in COMPONENT_TYPES: - discovery_info[category] = [] + for platform in PLATFORMS: + discovery_info[platform] = [] for module in modules: for channel in range(1, module.number_of_channels() + 1): - for category in COMPONENT_TYPES: - if category in module.get_categories(channel): - discovery_info[category].append( + for platform in PLATFORMS: + if platform in module.get_categories(channel): + discovery_info[platform].append( (module.get_module_address(), channel) ) hass.data[DOMAIN][entry.entry_id] = discovery_info - for category in COMPONENT_TYPES: - hass.add_job(hass.config_entries.async_forward_entry_setup(entry, category)) + for platform in PLATFORMS: + hass.add_job(hass.config_entries.async_forward_entry_setup(entry, platform)) try: controller = velbus.Controller(entry.data[CONF_PORT]) @@ -113,8 +113,8 @@ async def async_unload_entry(hass: HomeAssistantType, entry: ConfigEntry): """Remove the velbus connection.""" await asyncio.wait( [ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in COMPONENT_TYPES + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) hass.data[DOMAIN][entry.entry_id]["cntrl"].stop() diff --git a/homeassistant/components/velux/__init__.py b/homeassistant/components/velux/__init__.py index 90ed0a91b14..5c1d8bfd370 100644 --- a/homeassistant/components/velux/__init__.py +++ b/homeassistant/components/velux/__init__.py @@ -10,7 +10,7 @@ import homeassistant.helpers.config_validation as cv DOMAIN = "velux" DATA_VELUX = "data_velux" -SUPPORTED_DOMAINS = ["cover", "scene"] +PLATFORMS = ["cover", "scene"] _LOGGER = logging.getLogger(__name__) CONFIG_SCHEMA = vol.Schema( @@ -34,9 +34,9 @@ async def async_setup(hass, config): _LOGGER.exception("Can't connect to velux interface: %s", ex) return False - for component in SUPPORTED_DOMAINS: + for platform in PLATFORMS: hass.async_create_task( - discovery.async_load_platform(hass, component, DOMAIN, {}, config) + discovery.async_load_platform(hass, platform, DOMAIN, {}, config) ) return True diff --git a/homeassistant/components/verisure/__init__.py b/homeassistant/components/verisure/__init__.py index 2348d42a0d3..ab061faccad 100644 --- a/homeassistant/components/verisure/__init__.py +++ b/homeassistant/components/verisure/__init__.py @@ -38,6 +38,15 @@ from .const import ( SERVICE_ENABLE_AUTOLOCK, ) +PLATFORMS = [ + "sensor", + "switch", + "alarm_control_panel", + "lock", + "camera", + "binary_sensor", +] + HUB = None CONFIG_SCHEMA = vol.Schema( @@ -70,7 +79,7 @@ DEVICE_SERIAL_SCHEMA = vol.Schema({vol.Required(ATTR_DEVICE_SERIAL): cv.string}) def setup(hass, config): - """Set up the Verisure component.""" + """Set up the Verisure integration.""" global HUB # pylint: disable=global-statement HUB = VerisureHub(config[DOMAIN]) HUB.update_overview = Throttle(config[DOMAIN][CONF_SCAN_INTERVAL])( @@ -81,15 +90,8 @@ def setup(hass, config): hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, lambda event: HUB.logout()) HUB.update_overview() - for component in ( - "sensor", - "switch", - "alarm_control_panel", - "lock", - "camera", - "binary_sensor", - ): - discovery.load_platform(hass, component, DOMAIN, {}, config) + for platform in PLATFORMS: + discovery.load_platform(hass, platform, DOMAIN, {}, config) async def capture_smartcam(service): """Capture a new picture from a smartcam.""" diff --git a/homeassistant/components/vesync/__init__.py b/homeassistant/components/vesync/__init__.py index 24bd0f000df..686a71427c3 100644 --- a/homeassistant/components/vesync/__init__.py +++ b/homeassistant/components/vesync/__init__.py @@ -156,8 +156,8 @@ async def async_unload_entry(hass, entry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/vicare/__init__.py b/homeassistant/components/vicare/__init__.py index 940e076c813..3c8dfe948d0 100644 --- a/homeassistant/components/vicare/__init__.py +++ b/homeassistant/components/vicare/__init__.py @@ -19,7 +19,7 @@ from homeassistant.helpers.storage import STORAGE_DIR _LOGGER = logging.getLogger(__name__) -VICARE_PLATFORMS = ["climate", "sensor", "binary_sensor", "water_heater"] +PLATFORMS = ["climate", "sensor", "binary_sensor", "water_heater"] DOMAIN = "vicare" PYVICARE_ERROR = "error" @@ -91,7 +91,7 @@ def setup(hass, config): hass.data[DOMAIN][VICARE_NAME] = conf[CONF_NAME] hass.data[DOMAIN][VICARE_HEATING_TYPE] = heating_type - for platform in VICARE_PLATFORMS: + for platform in PLATFORMS: discovery.load_platform(hass, platform, DOMAIN, {}, config) return True diff --git a/homeassistant/components/volumio/__init__.py b/homeassistant/components/volumio/__init__.py index 8d171cab9d2..ec1fdec685a 100644 --- a/homeassistant/components/volumio/__init__.py +++ b/homeassistant/components/volumio/__init__.py @@ -35,9 +35,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): DATA_INFO: info, } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -48,8 +48,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/volvooncall/__init__.py b/homeassistant/components/volvooncall/__init__.py index 792fcc25eff..743bb903c72 100644 --- a/homeassistant/components/volvooncall/__init__.py +++ b/homeassistant/components/volvooncall/__init__.py @@ -39,7 +39,7 @@ CONF_MUTABLE = "mutable" SIGNAL_STATE_UPDATED = f"{DOMAIN}.updated" -COMPONENTS = { +PLATFORMS = { "sensor": "sensor", "binary_sensor": "binary_sensor", "lock": "lock", @@ -146,7 +146,7 @@ async def async_setup(hass, config): for instrument in ( instrument for instrument in dashboard.instruments - if instrument.component in COMPONENTS and is_enabled(instrument.slug_attr) + if instrument.component in PLATFORMS and is_enabled(instrument.slug_attr) ): data.instruments.add(instrument) @@ -154,7 +154,7 @@ async def async_setup(hass, config): hass.async_create_task( discovery.async_load_platform( hass, - COMPONENTS[instrument.component], + PLATFORMS[instrument.component], DOMAIN, (vehicle.vin, instrument.component, instrument.attr), config, diff --git a/homeassistant/components/wiffi/__init__.py b/homeassistant/components/wiffi/__init__.py index 000b961bda9..d93bd54437b 100644 --- a/homeassistant/components/wiffi/__init__.py +++ b/homeassistant/components/wiffi/__init__.py @@ -59,9 +59,9 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry): _LOGGER.error("Port %s already in use", config_entry.data[CONF_PORT]) raise ConfigEntryNotReady from exc - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(config_entry, component) + hass.config_entries.async_forward_entry_setup(config_entry, platform) ) return True @@ -80,8 +80,8 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(config_entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(config_entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/wilight/__init__.py b/homeassistant/components/wilight/__init__.py index 67433772551..3e14ea20b0c 100644 --- a/homeassistant/components/wilight/__init__.py +++ b/homeassistant/components/wilight/__init__.py @@ -33,9 +33,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): hass.data[DOMAIN][entry.entry_id] = parent # Set up all platforms for this device/entry. - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -47,8 +47,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): # Unload entities for this entry/device. await asyncio.gather( *( - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ) ) diff --git a/homeassistant/components/wled/__init__.py b/homeassistant/components/wled/__init__.py index 7cc91d32062..72fee5f078c 100644 --- a/homeassistant/components/wled/__init__.py +++ b/homeassistant/components/wled/__init__.py @@ -30,7 +30,7 @@ from .const import ( ) SCAN_INTERVAL = timedelta(seconds=5) -WLED_COMPONENTS = (LIGHT_DOMAIN, SENSOR_DOMAIN, SWITCH_DOMAIN) +PLATFORMS = (LIGHT_DOMAIN, SENSOR_DOMAIN, SWITCH_DOMAIN) _LOGGER = logging.getLogger(__name__) @@ -60,9 +60,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: ) # Set up all platforms for this device/entry. - for component in WLED_COMPONENTS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -75,8 +75,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: unload_ok = all( await asyncio.gather( *( - hass.config_entries.async_forward_entry_unload(entry, component) - for component in WLED_COMPONENTS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ) ) ) diff --git a/homeassistant/components/xbox/__init__.py b/homeassistant/components/xbox/__init__.py index 3e8d537799a..1d921f5fd18 100644 --- a/homeassistant/components/xbox/__init__.py +++ b/homeassistant/components/xbox/__init__.py @@ -101,9 +101,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): "coordinator": coordinator, } - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -114,8 +114,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/xiaomi_aqara/__init__.py b/homeassistant/components/xiaomi_aqara/__init__.py index f54c262abba..a33f697abdf 100644 --- a/homeassistant/components/xiaomi_aqara/__init__.py +++ b/homeassistant/components/xiaomi_aqara/__init__.py @@ -188,9 +188,9 @@ async def async_setup_entry( else: platforms = GATEWAY_PLATFORMS_NO_KEY - for component in platforms: + for platform in platforms: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -208,8 +208,8 @@ async def async_unload_entry( unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in platforms + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in platforms ] ) ) diff --git a/homeassistant/components/xiaomi_miio/__init__.py b/homeassistant/components/xiaomi_miio/__init__.py index 42b491c9b55..a72298c7c44 100644 --- a/homeassistant/components/xiaomi_miio/__init__.py +++ b/homeassistant/components/xiaomi_miio/__init__.py @@ -106,9 +106,9 @@ async def async_setup_gateway_entry( KEY_COORDINATOR: coordinator, } - for component in GATEWAY_PLATFORMS: + for platform in GATEWAY_PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -133,9 +133,9 @@ async def async_setup_device_entry( if not platforms: return False - for component in platforms: + for platform in platforms: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True diff --git a/homeassistant/components/xs1/__init__.py b/homeassistant/components/xs1/__init__.py index 8651c33546c..9392b9be403 100644 --- a/homeassistant/components/xs1/__init__.py +++ b/homeassistant/components/xs1/__init__.py @@ -38,7 +38,7 @@ CONFIG_SCHEMA = vol.Schema( extra=vol.ALLOW_EXTRA, ) -XS1_COMPONENTS = ["climate", "sensor", "switch"] +PLATFORMS = ["climate", "sensor", "switch"] # Lock used to limit the amount of concurrent update requests # as the XS1 Gateway can only handle a very @@ -47,7 +47,7 @@ UPDATE_LOCK = asyncio.Lock() def setup(hass, config): - """Set up XS1 Component.""" + """Set up XS1 integration.""" _LOGGER.debug("Initializing XS1") host = config[DOMAIN][CONF_HOST] @@ -78,10 +78,10 @@ def setup(hass, config): hass.data[DOMAIN][ACTUATORS] = actuators hass.data[DOMAIN][SENSORS] = sensors - _LOGGER.debug("Loading components for XS1 platform...") - # Load components for supported devices - for component in XS1_COMPONENTS: - discovery.load_platform(hass, component, DOMAIN, {}, config) + _LOGGER.debug("Loading platforms for XS1 integration...") + # Load platforms for supported devices + for platform in PLATFORMS: + discovery.load_platform(hass, platform, DOMAIN, {}, config) return True diff --git a/homeassistant/components/yeelight/__init__.py b/homeassistant/components/yeelight/__init__.py index f24847a2d54..a86af10fe1c 100644 --- a/homeassistant/components/yeelight/__init__.py +++ b/homeassistant/components/yeelight/__init__.py @@ -198,9 +198,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: async def _load_platforms(): - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) # Move options from data for imported entries @@ -246,8 +246,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/zerproc/__init__.py b/homeassistant/components/zerproc/__init__.py index 2c652f61c21..f3d2e9daebc 100644 --- a/homeassistant/components/zerproc/__init__.py +++ b/homeassistant/components/zerproc/__init__.py @@ -20,9 +20,9 @@ async def async_setup(hass, config): async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): """Set up Zerproc from a config entry.""" - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -33,8 +33,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): return all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/homeassistant/components/zha/__init__.py b/homeassistant/components/zha/__init__.py index 351fc86a1e5..de5c5423fe1 100644 --- a/homeassistant/components/zha/__init__.py +++ b/homeassistant/components/zha/__init__.py @@ -16,7 +16,6 @@ from . import api from .core import ZHAGateway from .core.const import ( BAUD_RATES, - COMPONENTS, CONF_BAUDRATE, CONF_DATABASE, CONF_DEVICE_CONFIG, @@ -30,6 +29,7 @@ from .core.const import ( DATA_ZHA_GATEWAY, DATA_ZHA_PLATFORM_LOADED, DOMAIN, + PLATFORMS, SIGNAL_ADD_ENTITIES, RadioType, ) @@ -88,8 +88,8 @@ async def async_setup_entry(hass, config_entry): zha_data = hass.data.setdefault(DATA_ZHA, {}) config = zha_data.get(DATA_ZHA_CONFIG, {}) - for component in COMPONENTS: - zha_data.setdefault(component, []) + for platform in PLATFORMS: + zha_data.setdefault(platform, []) if config.get(CONF_ENABLE_QUIRKS, True): # needs to be done here so that the ZHA module is finished loading @@ -101,8 +101,8 @@ async def async_setup_entry(hass, config_entry): zha_data[DATA_ZHA_DISPATCHERS] = [] zha_data[DATA_ZHA_PLATFORM_LOADED] = [] - for component in COMPONENTS: - coro = hass.config_entries.async_forward_entry_setup(config_entry, component) + for platform in PLATFORMS: + coro = hass.config_entries.async_forward_entry_setup(config_entry, platform) zha_data[DATA_ZHA_PLATFORM_LOADED].append(hass.async_create_task(coro)) device_registry = await hass.helpers.device_registry.async_get_registry() @@ -138,8 +138,8 @@ async def async_unload_entry(hass, config_entry): for unsub_dispatcher in dispatchers: unsub_dispatcher() - for component in COMPONENTS: - await hass.config_entries.async_forward_entry_unload(config_entry, component) + for platform in PLATFORMS: + await hass.config_entries.async_forward_entry_unload(config_entry, platform) return True diff --git a/homeassistant/components/zha/core/const.py b/homeassistant/components/zha/core/const.py index ac4f53d2a8c..2454085d9a4 100644 --- a/homeassistant/components/zha/core/const.py +++ b/homeassistant/components/zha/core/const.py @@ -104,7 +104,7 @@ CLUSTER_COMMANDS_SERVER = "server_commands" CLUSTER_TYPE_IN = "in" CLUSTER_TYPE_OUT = "out" -COMPONENTS = ( +PLATFORMS = ( BINARY_SENSOR, CLIMATE, COVER, diff --git a/homeassistant/components/zha/core/discovery.py b/homeassistant/components/zha/core/discovery.py index e071a523321..ba970570ecb 100644 --- a/homeassistant/components/zha/core/discovery.py +++ b/homeassistant/components/zha/core/discovery.py @@ -75,7 +75,7 @@ class ProbeEndpoint: ep_device_type = channel_pool.endpoint.device_type component = zha_regs.DEVICE_CLASS[ep_profile_id].get(ep_device_type) - if component and component in zha_const.COMPONENTS: + if component and component in zha_const.PLATFORMS: channels = channel_pool.unclaimed_channels() entity_class, claimed = zha_regs.ZHA_ENTITIES.get_entity( component, channel_pool.manufacturer, channel_pool.model, channels @@ -122,7 +122,7 @@ class ProbeEndpoint: ep_channels: zha_typing.ChannelPoolType, ) -> None: """Probe specified cluster for specific component.""" - if component is None or component not in zha_const.COMPONENTS: + if component is None or component not in zha_const.PLATFORMS: return channel_list = [channel] unique_id = f"{ep_channels.unique_id}-{channel.cluster.cluster_id}" diff --git a/homeassistant/components/zwave/__init__.py b/homeassistant/components/zwave/__init__.py index 8e9889b5fac..0ab1f786555 100644 --- a/homeassistant/components/zwave/__init__.py +++ b/homeassistant/components/zwave/__init__.py @@ -89,7 +89,7 @@ DEFAULT_CONF_INVERT_PERCENT = False DEFAULT_CONF_REFRESH_VALUE = False DEFAULT_CONF_REFRESH_DELAY = 5 -SUPPORTED_PLATFORMS = [ +PLATFORMS = [ "binary_sensor", "climate", "cover", @@ -1060,7 +1060,7 @@ async def async_setup_entry(hass, config_entry): hass.services.async_register(DOMAIN, const.SERVICE_START_NETWORK, start_zwave) - for entry_component in SUPPORTED_PLATFORMS: + for entry_component in PLATFORMS: hass.async_create_task( hass.config_entries.async_forward_entry_setup(config_entry, entry_component) ) @@ -1228,7 +1228,7 @@ class ZWaveDeviceEntityValues: return self._hass.data[DATA_DEVICES][device.unique_id] = device - if component in SUPPORTED_PLATFORMS: + if component in PLATFORMS: async_dispatcher_send(self._hass, f"zwave_new_{component}", device) else: await discovery.async_load_platform( diff --git a/homeassistant/components/zwave_js/__init__.py b/homeassistant/components/zwave_js/__init__.py index 798fd9fda2c..4f4c8d6eab0 100644 --- a/homeassistant/components/zwave_js/__init__.py +++ b/homeassistant/components/zwave_js/__init__.py @@ -278,8 +278,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: # wait until all required platforms are ready await asyncio.gather( *[ - hass.config_entries.async_forward_entry_setup(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_setup(entry, platform) + for platform in PLATFORMS ] ) @@ -388,8 +388,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/script/scaffold/templates/config_flow/integration/__init__.py b/script/scaffold/templates/config_flow/integration/__init__.py index c6df6e99979..334ac8dbbc9 100644 --- a/script/scaffold/templates/config_flow/integration/__init__.py +++ b/script/scaffold/templates/config_flow/integration/__init__.py @@ -21,9 +21,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): # TODO Store an API object for your platforms to access # hass.data[DOMAIN][entry.entry_id] = MyApi(...) - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -34,8 +34,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/script/scaffold/templates/config_flow_discovery/integration/__init__.py b/script/scaffold/templates/config_flow_discovery/integration/__init__.py index c6df6e99979..334ac8dbbc9 100644 --- a/script/scaffold/templates/config_flow_discovery/integration/__init__.py +++ b/script/scaffold/templates/config_flow_discovery/integration/__init__.py @@ -21,9 +21,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): # TODO Store an API object for your platforms to access # hass.data[DOMAIN][entry.entry_id] = MyApi(...) - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -34,8 +34,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/script/scaffold/templates/config_flow_oauth2/integration/__init__.py b/script/scaffold/templates/config_flow_oauth2/integration/__init__.py index c51061b57fe..4e290921047 100644 --- a/script/scaffold/templates/config_flow_oauth2/integration/__init__.py +++ b/script/scaffold/templates/config_flow_oauth2/integration/__init__.py @@ -72,9 +72,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry): aiohttp_client.async_get_clientsession(hass), session ) - for component in PLATFORMS: + for platform in PLATFORMS: hass.async_create_task( - hass.config_entries.async_forward_entry_setup(entry, component) + hass.config_entries.async_forward_entry_setup(entry, platform) ) return True @@ -85,8 +85,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): unload_ok = all( await asyncio.gather( *[ - hass.config_entries.async_forward_entry_unload(entry, component) - for component in PLATFORMS + hass.config_entries.async_forward_entry_unload(entry, platform) + for platform in PLATFORMS ] ) ) diff --git a/tests/components/abode/common.py b/tests/components/abode/common.py index aabc732daa2..c134552ccd4 100644 --- a/tests/components/abode/common.py +++ b/tests/components/abode/common.py @@ -16,7 +16,7 @@ async def setup_platform(hass, platform): ) mock_entry.add_to_hass(hass) - with patch("homeassistant.components.abode.ABODE_PLATFORMS", [platform]), patch( + with patch("homeassistant.components.abode.PLATFORMS", [platform]), patch( "abodepy.event_controller.sio" ), patch("abodepy.utils.save_cache"): assert await async_setup_component(hass, ABODE_DOMAIN, {}) diff --git a/tests/components/dynalite/test_init.py b/tests/components/dynalite/test_init.py index eab88fb18ca..34b66399a3e 100644 --- a/tests/components/dynalite/test_init.py +++ b/tests/components/dynalite/test_init.py @@ -277,9 +277,7 @@ async def test_unload_entry(hass): ) as mock_unload: assert await hass.config_entries.async_unload(entry.entry_id) await hass.async_block_till_done() - assert mock_unload.call_count == len(dynalite.ENTITY_PLATFORMS) - expected_calls = [ - call(entry, platform) for platform in dynalite.ENTITY_PLATFORMS - ] + assert mock_unload.call_count == len(dynalite.PLATFORMS) + expected_calls = [call(entry, platform) for platform in dynalite.PLATFORMS] for cur_call in mock_unload.mock_calls: assert cur_call in expected_calls diff --git a/tests/components/dyson/conftest.py b/tests/components/dyson/conftest.py index 747f7a43986..300c80f3a73 100644 --- a/tests/components/dyson/conftest.py +++ b/tests/components/dyson/conftest.py @@ -26,8 +26,8 @@ async def device(hass: HomeAssistant, request) -> DysonDevice: device = get_device() with patch(f"{BASE_PATH}.DysonAccount.login", return_value=True), patch( f"{BASE_PATH}.DysonAccount.devices", return_value=[device] - ), patch(f"{BASE_PATH}.DYSON_PLATFORMS", [platform]): - # DYSON_PLATFORMS is patched so that only the platform being tested is set up + ), patch(f"{BASE_PATH}.PLATFORMS", [platform]): + # PLATFORMS is patched so that only the platform being tested is set up await async_setup_component( hass, DOMAIN, diff --git a/tests/components/dyson/test_init.py b/tests/components/dyson/test_init.py index 2535da4d166..714ac919c19 100644 --- a/tests/components/dyson/test_init.py +++ b/tests/components/dyson/test_init.py @@ -54,7 +54,7 @@ async def test_setup_manual(hass: HomeAssistant): with patch(f"{BASE_PATH}.DysonAccount.login", return_value=True) as login, patch( f"{BASE_PATH}.DysonAccount.devices", return_value=devices ) as devices_method, patch( - f"{BASE_PATH}.DYSON_PLATFORMS", ["fan", "vacuum"] + f"{BASE_PATH}.PLATFORMS", ["fan", "vacuum"] ): # Patch platforms to get rid of sensors assert await async_setup_component(hass, DOMAIN, config) await hass.async_block_till_done() @@ -85,7 +85,7 @@ async def test_setup_autoconnect(hass: HomeAssistant): with patch(f"{BASE_PATH}.DysonAccount.login", return_value=True), patch( f"{BASE_PATH}.DysonAccount.devices", return_value=devices ), patch( - f"{BASE_PATH}.DYSON_PLATFORMS", ["fan"] + f"{BASE_PATH}.PLATFORMS", ["fan"] ): # Patch platforms to get rid of sensors assert await async_setup_component(hass, DOMAIN, config) await hass.async_block_till_done() diff --git a/tests/components/dyson/test_sensor.py b/tests/components/dyson/test_sensor.py index a1f8e4bb37c..4541ef2190a 100644 --- a/tests/components/dyson/test_sensor.py +++ b/tests/components/dyson/test_sensor.py @@ -168,8 +168,8 @@ async def test_temperature( device = async_get_device(DysonPureCoolLink) with patch(f"{BASE_PATH}.DysonAccount.login", return_value=True), patch( f"{BASE_PATH}.DysonAccount.devices", return_value=[device] - ), patch(f"{BASE_PATH}.DYSON_PLATFORMS", [PLATFORM_DOMAIN]): - # DYSON_PLATFORMS is patched so that only the platform being tested is set up + ), patch(f"{BASE_PATH}.PLATFORMS", [PLATFORM_DOMAIN]): + # PLATFORMS is patched so that only the platform being tested is set up await async_setup_component( hass, DOMAIN, diff --git a/tests/components/onewire/test_binary_sensor.py b/tests/components/onewire/test_binary_sensor.py index aee1641c24f..dd44510e0ad 100644 --- a/tests/components/onewire/test_binary_sensor.py +++ b/tests/components/onewire/test_binary_sensor.py @@ -68,7 +68,7 @@ async def test_owserver_binary_sensor(owproxy, hass, device_id): item["default_disabled"] = False with patch( - "homeassistant.components.onewire.SUPPORTED_PLATFORMS", [BINARY_SENSOR_DOMAIN] + "homeassistant.components.onewire.PLATFORMS", [BINARY_SENSOR_DOMAIN] ), patch.dict( "homeassistant.components.onewire.binary_sensor.DEVICE_BINARY_SENSORS", patch_device_binary_sensors, diff --git a/tests/components/onewire/test_entity_owserver.py b/tests/components/onewire/test_entity_owserver.py index 42cbf77711c..a3a205795bf 100644 --- a/tests/components/onewire/test_entity_owserver.py +++ b/tests/components/onewire/test_entity_owserver.py @@ -5,11 +5,7 @@ from pyownet.protocol import Error as ProtocolError import pytest from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN -from homeassistant.components.onewire.const import ( - DOMAIN, - PRESSURE_CBAR, - SUPPORTED_PLATFORMS, -) +from homeassistant.components.onewire.const import DOMAIN, PLATFORMS, PRESSURE_CBAR from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN from homeassistant.const import ( @@ -754,7 +750,7 @@ MOCK_DEVICE_SENSORS = { @pytest.mark.parametrize("device_id", MOCK_DEVICE_SENSORS.keys()) -@pytest.mark.parametrize("platform", SUPPORTED_PLATFORMS) +@pytest.mark.parametrize("platform", PLATFORMS) @patch("homeassistant.components.onewire.onewirehub.protocol.proxy") async def test_owserver_setup_valid_device(owproxy, hass, device_id, platform): """Test for 1-Wire device. @@ -782,7 +778,7 @@ async def test_owserver_setup_valid_device(owproxy, hass, device_id, platform): owproxy.return_value.dir.return_value = dir_return_value owproxy.return_value.read.side_effect = read_side_effect - with patch("homeassistant.components.onewire.SUPPORTED_PLATFORMS", [platform]): + with patch("homeassistant.components.onewire.PLATFORMS", [platform]): await setup_onewire_patched_owserver_integration(hass) await hass.async_block_till_done() diff --git a/tests/components/onewire/test_sensor.py b/tests/components/onewire/test_sensor.py index 9e91da01b21..44351cf9a63 100644 --- a/tests/components/onewire/test_sensor.py +++ b/tests/components/onewire/test_sensor.py @@ -134,7 +134,7 @@ async def test_sensors_on_owserver_coupler(owproxy, hass, device_id): owproxy.return_value.dir.side_effect = dir_side_effect owproxy.return_value.read.side_effect = read_side_effect - with patch("homeassistant.components.onewire.SUPPORTED_PLATFORMS", [SENSOR_DOMAIN]): + with patch("homeassistant.components.onewire.PLATFORMS", [SENSOR_DOMAIN]): await setup_onewire_patched_owserver_integration(hass) await hass.async_block_till_done() diff --git a/tests/components/onewire/test_switch.py b/tests/components/onewire/test_switch.py index 1c778d4e264..0d8c9918711 100644 --- a/tests/components/onewire/test_switch.py +++ b/tests/components/onewire/test_switch.py @@ -94,7 +94,7 @@ async def test_owserver_switch(owproxy, hass, device_id): item["default_disabled"] = False with patch( - "homeassistant.components.onewire.SUPPORTED_PLATFORMS", [SWITCH_DOMAIN] + "homeassistant.components.onewire.PLATFORMS", [SWITCH_DOMAIN] ), patch.dict( "homeassistant.components.onewire.switch.DEVICE_SWITCHES", patch_device_switches ): diff --git a/tests/components/smartthings/test_init.py b/tests/components/smartthings/test_init.py index 9024b72bb85..eed1d5d26b1 100644 --- a/tests/components/smartthings/test_init.py +++ b/tests/components/smartthings/test_init.py @@ -14,8 +14,8 @@ from homeassistant.components.smartthings.const import ( DATA_BROKERS, DOMAIN, EVENT_BUTTON, + PLATFORMS, SIGNAL_SMARTTHINGS_UPDATE, - SUPPORTED_PLATFORMS, ) from homeassistant.config import async_process_ha_core_config from homeassistant.const import HTTP_FORBIDDEN, HTTP_INTERNAL_SERVER_ERROR @@ -174,7 +174,7 @@ async def test_scenes_unauthorized_loads_platforms( assert await smartthings.async_setup_entry(hass, config_entry) # Assert platforms loaded await hass.async_block_till_done() - assert forward_mock.call_count == len(SUPPORTED_PLATFORMS) + assert forward_mock.call_count == len(PLATFORMS) async def test_config_entry_loads_platforms( @@ -206,7 +206,7 @@ async def test_config_entry_loads_platforms( assert await smartthings.async_setup_entry(hass, config_entry) # Assert platforms loaded await hass.async_block_till_done() - assert forward_mock.call_count == len(SUPPORTED_PLATFORMS) + assert forward_mock.call_count == len(PLATFORMS) async def test_config_entry_loads_unconnected_cloud( @@ -237,7 +237,7 @@ async def test_config_entry_loads_unconnected_cloud( with patch.object(hass.config_entries, "async_forward_entry_setup") as forward_mock: assert await smartthings.async_setup_entry(hass, config_entry) await hass.async_block_till_done() - assert forward_mock.call_count == len(SUPPORTED_PLATFORMS) + assert forward_mock.call_count == len(PLATFORMS) async def test_unload_entry(hass, config_entry): @@ -258,7 +258,7 @@ async def test_unload_entry(hass, config_entry): assert config_entry.entry_id not in hass.data[DOMAIN][DATA_BROKERS] # Assert platforms unloaded await hass.async_block_till_done() - assert forward_mock.call_count == len(SUPPORTED_PLATFORMS) + assert forward_mock.call_count == len(PLATFORMS) async def test_remove_entry(hass, config_entry, smartthings_mock): diff --git a/tests/components/unifi/test_controller.py b/tests/components/unifi/test_controller.py index 00865b4e910..6b40df5857f 100644 --- a/tests/components/unifi/test_controller.py +++ b/tests/components/unifi/test_controller.py @@ -22,10 +22,7 @@ from homeassistant.components.unifi.const import ( DOMAIN as UNIFI_DOMAIN, UNIFI_WIRELESS_CLIENTS, ) -from homeassistant.components.unifi.controller import ( - SUPPORTED_PLATFORMS, - get_controller, -) +from homeassistant.components.unifi.controller import PLATFORMS, get_controller from homeassistant.components.unifi.errors import AuthenticationRequired, CannotConnect from homeassistant.const import ( CONF_HOST, @@ -211,7 +208,7 @@ async def test_controller_setup(hass, aioclient_mock): controller = hass.data[UNIFI_DOMAIN][config_entry.entry_id] entry = controller.config_entry - assert len(forward_entry_setup.mock_calls) == len(SUPPORTED_PLATFORMS) + assert len(forward_entry_setup.mock_calls) == len(PLATFORMS) assert forward_entry_setup.mock_calls[0][1] == (entry, TRACKER_DOMAIN) assert forward_entry_setup.mock_calls[1][1] == (entry, SENSOR_DOMAIN) assert forward_entry_setup.mock_calls[2][1] == (entry, SWITCH_DOMAIN) diff --git a/tests/components/zha/test_discover.py b/tests/components/zha/test_discover.py index ac2ef085e14..d4195c681e7 100644 --- a/tests/components/zha/test_discover.py +++ b/tests/components/zha/test_discover.py @@ -96,7 +96,7 @@ async def test_devices( entity_ids = hass_disable_services.states.async_entity_ids() await hass_disable_services.async_block_till_done() zha_entity_ids = { - ent for ent in entity_ids if ent.split(".")[0] in zha_const.COMPONENTS + ent for ent in entity_ids if ent.split(".")[0] in zha_const.PLATFORMS } if cluster_identify: