From 1a35883427e64991ab4aba896b351b35537f938d Mon Sep 17 00:00:00 2001 From: Sezer K Date: Tue, 27 Apr 2021 11:36:34 +0200 Subject: [PATCH 1/3] Only initialize Nuki configurations Workaround for https://github.com/home-assistant/core/issues/48358 --- homeassistant/components/nuki/__init__.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/nuki/__init__.py b/homeassistant/components/nuki/__init__.py index 173beca0c4a6de..9f451463f4b21a 100644 --- a/homeassistant/components/nuki/__init__.py +++ b/homeassistant/components/nuki/__init__.py @@ -60,11 +60,12 @@ async def async_setup(hass, config): continue for conf in confs: - hass.async_create_task( - hass.config_entries.flow.async_init( - DOMAIN, context={"source": SOURCE_IMPORT}, data=conf + if "host" in conf and "port" in conf and "token" in conf: + hass.async_create_task( + hass.config_entries.flow.async_init( + DOMAIN, context={"source": SOURCE_IMPORT}, data=conf + ) ) - ) return True From 4b3ef080f3e6a319ed75d258f41281ea5f7771fb Mon Sep 17 00:00:00 2001 From: Sezer K Date: Wed, 5 May 2021 21:49:53 +0200 Subject: [PATCH 2/3] Update __init__.py --- homeassistant/components/nuki/__init__.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/homeassistant/components/nuki/__init__.py b/homeassistant/components/nuki/__init__.py index 173beca0c4a6de..ae2d42fbb63fc1 100644 --- a/homeassistant/components/nuki/__init__.py +++ b/homeassistant/components/nuki/__init__.py @@ -11,7 +11,7 @@ from homeassistant import exceptions from homeassistant.config_entries import SOURCE_IMPORT -from homeassistant.const import CONF_HOST, CONF_PORT, CONF_TOKEN +from homeassistant.const import CONF_HOST, CONF_PORT, CONF_TOKEN, CONF_PLATFORM from homeassistant.helpers.update_coordinator import ( CoordinatorEntity, DataUpdateCoordinator, @@ -23,6 +23,7 @@ DATA_COORDINATOR, DATA_LOCKS, DATA_OPENERS, + DEFAULT_PORT, DEFAULT_TIMEOUT, DOMAIN, ERROR_STATES, @@ -60,11 +61,19 @@ async def async_setup(hass, config): continue for conf in confs: - hass.async_create_task( - hass.config_entries.flow.async_init( - DOMAIN, context={"source": SOURCE_IMPORT}, data=conf + if CONF_PLATFORM in conf and conf[CONF_PLATFORM] == DOMAIN: + hass.async_create_task( + hass.config_entries.flow.async_init( + DOMAIN, + context={"source": SOURCE_IMPORT}, + data={ + CONF_HOST: conf[CONF_HOST], + CONF_PORT: conf.get(CONF_PORT, DEFAULT_PORT), + CONF_TOKEN: conf[CONF_TOKEN] + } + ) ) - ) + return True From a5ae681858020c714116a9a938bf4b2b49a5af7d Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Thu, 6 May 2021 21:18:49 -0700 Subject: [PATCH 3/3] Black --- homeassistant/components/nuki/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/nuki/__init__.py b/homeassistant/components/nuki/__init__.py index c92a83bcf25887..97328c7671a0f2 100644 --- a/homeassistant/components/nuki/__init__.py +++ b/homeassistant/components/nuki/__init__.py @@ -11,7 +11,7 @@ from homeassistant import exceptions from homeassistant.config_entries import SOURCE_IMPORT -from homeassistant.const import CONF_HOST, CONF_PORT, CONF_TOKEN, CONF_PLATFORM +from homeassistant.const import CONF_HOST, CONF_PLATFORM, CONF_PORT, CONF_TOKEN from homeassistant.helpers.update_coordinator import ( CoordinatorEntity, DataUpdateCoordinator, @@ -69,8 +69,8 @@ async def async_setup(hass, config): data={ CONF_HOST: conf[CONF_HOST], CONF_PORT: conf.get(CONF_PORT, DEFAULT_PORT), - CONF_TOKEN: conf[CONF_TOKEN] - } + CONF_TOKEN: conf[CONF_TOKEN], + }, ) )