From 4b5718431d69920ae5579bbf147214a65137a099 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Fri, 28 Jun 2019 22:23:00 -0700 Subject: [PATCH] Guard for None entity config (#24838) --- homeassistant/components/alexa/smart_home_http.py | 2 +- homeassistant/components/cloud/google_config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/alexa/smart_home_http.py b/homeassistant/components/alexa/smart_home_http.py index e9437a411d6..4636ee10bb7 100644 --- a/homeassistant/components/alexa/smart_home_http.py +++ b/homeassistant/components/alexa/smart_home_http.py @@ -52,7 +52,7 @@ class AlexaConfig(AbstractConfig): @property def entity_config(self): """Return entity config.""" - return self._config.get(CONF_ENTITY_CONFIG, {}) + return self._config.get(CONF_ENTITY_CONFIG) or {} def should_expose(self, entity_id): """If an entity should be exposed.""" diff --git a/homeassistant/components/cloud/google_config.py b/homeassistant/components/cloud/google_config.py index b047d25ee49..5e95417cd33 100644 --- a/homeassistant/components/cloud/google_config.py +++ b/homeassistant/components/cloud/google_config.py @@ -24,7 +24,7 @@ class CloudGoogleConfig(AbstractConfig): @property def entity_config(self): """Return entity config.""" - return self._config.get(CONF_ENTITY_CONFIG) + return self._config.get(CONF_ENTITY_CONFIG) or {} @property def secure_devices_pin(self):