From 4b3a932d88b19a6af92013d376a95153e44abfbe Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sun, 13 Aug 2017 11:29:48 -0700 Subject: [PATCH] Sabnzbd: do not assume discovery info is a dict (#8951) --- homeassistant/components/sensor/sabnzbd.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/homeassistant/components/sensor/sabnzbd.py b/homeassistant/components/sensor/sabnzbd.py index dd02ce389f3..e2b7584d865 100644 --- a/homeassistant/components/sensor/sabnzbd.py +++ b/homeassistant/components/sensor/sabnzbd.py @@ -130,15 +130,16 @@ def setup_platform(hass, config, add_devices, discovery_info=None): """Set up the SABnzbd platform.""" from pysabnzbd import SabnzbdApi - host = config.get(CONF_HOST) or discovery_info.get(CONF_HOST) - port = config.get(CONF_PORT) or discovery_info.get(CONF_PORT) - name = config.get(CONF_NAME, DEFAULT_NAME) - use_ssl = DEFAULT_SSL - - if config.get(CONF_SSL): - use_ssl = True - elif discovery_info.get('properties', {}).get('https', '0') == '1': - use_ssl = True + if discovery_info is not None: + host = discovery_info.get(CONF_HOST) + port = discovery_info.get(CONF_PORT) + name = DEFAULT_NAME + use_ssl = discovery_info.get('properties', {}).get('https', '0') == '1' + else: + host = config.get(CONF_HOST) + port = config.get(CONF_PORT) + name = config.get(CONF_NAME, DEFAULT_NAME) + use_ssl = config.get(CONF_SSL) uri_scheme = 'https://' if use_ssl else 'http://' base_url = "{}{}:{}/".format(uri_scheme, host, port)