From fd49da37b8afd8446c202fe34085177e006c5da7 Mon Sep 17 00:00:00 2001 From: Aaron Bach Date: Sat, 16 Oct 2021 23:59:19 -0600 Subject: [PATCH] Make sure OpenUV data storage conforms to standards (#57813) --- homeassistant/components/openuv/__init__.py | 8 ++++---- homeassistant/components/openuv/binary_sensor.py | 2 +- homeassistant/components/openuv/const.py | 1 - homeassistant/components/openuv/sensor.py | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/homeassistant/components/openuv/__init__.py b/homeassistant/components/openuv/__init__.py index 5b92dbcc39e..e38d95a6101 100644 --- a/homeassistant/components/openuv/__init__.py +++ b/homeassistant/components/openuv/__init__.py @@ -31,7 +31,6 @@ from .const import ( CONF_FROM_WINDOW, CONF_TO_WINDOW, DATA_CLIENT, - DATA_LISTENER, DATA_PROTECTION_WINDOW, DATA_UV, DEFAULT_FROM_WINDOW, @@ -52,7 +51,8 @@ PLATFORMS = ["binary_sensor", "sensor"] async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: """Set up OpenUV as config entry.""" - hass.data.setdefault(DOMAIN, {DATA_CLIENT: {}, DATA_LISTENER: {}}) + hass.data.setdefault(DOMAIN, {}) + hass.data[DOMAIN][entry.entry_id] = {} _verify_domain_control = verify_domain_control(hass, DOMAIN) @@ -69,11 +69,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: ), ) await openuv.async_update() - hass.data[DOMAIN][DATA_CLIENT][entry.entry_id] = openuv except OpenUvError as err: LOGGER.error("Config entry failed: %s", err) raise ConfigEntryNotReady from err + hass.data[DOMAIN][entry.entry_id][DATA_CLIENT] = openuv hass.config_entries.async_setup_platforms(entry, PLATFORMS) @_verify_domain_control @@ -111,7 +111,7 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: """Unload an OpenUV config entry.""" unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS) if unload_ok: - hass.data[DOMAIN][DATA_CLIENT].pop(entry.entry_id) + hass.data[DOMAIN].pop(entry.entry_id) return unload_ok diff --git a/homeassistant/components/openuv/binary_sensor.py b/homeassistant/components/openuv/binary_sensor.py index a632d212abd..4d10aa53a39 100644 --- a/homeassistant/components/openuv/binary_sensor.py +++ b/homeassistant/components/openuv/binary_sensor.py @@ -33,7 +33,7 @@ async def async_setup_entry( hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback ) -> None: """Set up an OpenUV sensor based on a config entry.""" - openuv = hass.data[DOMAIN][DATA_CLIENT][entry.entry_id] + openuv = hass.data[DOMAIN][entry.entry_id][DATA_CLIENT] async_add_entities( [OpenUvBinarySensor(openuv, BINARY_SENSOR_DESCRIPTION_PROTECTION_WINDOW)] ) diff --git a/homeassistant/components/openuv/const.py b/homeassistant/components/openuv/const.py index 3b117fe37aa..975511c7297 100644 --- a/homeassistant/components/openuv/const.py +++ b/homeassistant/components/openuv/const.py @@ -8,7 +8,6 @@ CONF_FROM_WINDOW = "from_window" CONF_TO_WINDOW = "to_window" DATA_CLIENT = "data_client" -DATA_LISTENER = "data_listener" DATA_PROTECTION_WINDOW = "protection_window" DATA_UV = "uv" diff --git a/homeassistant/components/openuv/sensor.py b/homeassistant/components/openuv/sensor.py index 7f091bc1a79..2eac6ba41b2 100644 --- a/homeassistant/components/openuv/sensor.py +++ b/homeassistant/components/openuv/sensor.py @@ -122,7 +122,7 @@ async def async_setup_entry( hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback ) -> None: """Set up a OpenUV sensor based on a config entry.""" - openuv = hass.data[DOMAIN][DATA_CLIENT][entry.entry_id] + openuv = hass.data[DOMAIN][entry.entry_id][DATA_CLIENT] async_add_entities( [OpenUvSensor(openuv, description) for description in SENSOR_DESCRIPTIONS] )