Merge pull request #1446 from balloob/hotfix/0.14.2

Hotfix/0.14.2

homeassistant/components/binary_sensor/zwave.py

@@ -39,22 +39,26 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     node = NETWORK.nodes[discovery_info[ATTR_NODE_ID]]
     value = node.values[discovery_info[ATTR_VALUE_ID]]
-
-    specific_sensor_key = (int(value.node.manufacturer_id, 16),
-                           int(value.node.product_id, 16),
-                           value.index)
-
     value.set_change_verified(False)
-    if specific_sensor_key in DEVICE_MAPPINGS:
-        if DEVICE_MAPPINGS[specific_sensor_key] == WORKAROUND_NO_OFF_EVENT:
-            # Default the multiplier to 4
-            re_arm_multiplier = (get_config_value(value.node, 9) or 4)
-            add_devices([
-                ZWaveTriggerSensor(value, "motion",
-                                   hass, re_arm_multiplier * 8)
-            ])
 
-    elif value.command_class == COMMAND_CLASS_SENSOR_BINARY:
+    # Make sure that we have values for the key before converting to int
+    if (value.node.manufacturer_id.strip() and
+            value.node.product_id.strip()):
+        specific_sensor_key = (int(value.node.manufacturer_id, 16),
+                               int(value.node.product_id, 16),
+                               value.index)
+
+        if specific_sensor_key in DEVICE_MAPPINGS:
+            if DEVICE_MAPPINGS[specific_sensor_key] == WORKAROUND_NO_OFF_EVENT:
+                # Default the multiplier to 4
+                re_arm_multiplier = (get_config_value(value.node, 9) or 4)
+                add_devices([
+                    ZWaveTriggerSensor(value, "motion",
+                                       hass, re_arm_multiplier * 8)
+                ])
+                return
+
+    if value.command_class == COMMAND_CLASS_SENSOR_BINARY:
         add_devices([ZWaveBinarySensor(value, None)])
 
 

homeassistant/components/sensor/zwave.py

@@ -50,17 +50,20 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     #                     groups[1].associations):
     #     node.groups[1].add_association(NETWORK.controller.node_id)
 
-    specific_sensor_key = (int(value.node.manufacturer_id, 16),
-                           int(value.node.product_id, 16),
-                           value.index)
+    # Make sure that we have values for the key before converting to int
+    if (value.node.manufacturer_id.strip() and
+            value.node.product_id.strip()):
+        specific_sensor_key = (int(value.node.manufacturer_id, 16),
+                               int(value.node.product_id, 16),
+                               value.index)
 
-    # Check workaround mappings for specific devices.
-    if specific_sensor_key in DEVICE_MAPPINGS:
-        if DEVICE_MAPPINGS[specific_sensor_key] == WORKAROUND_IGNORE:
-            return
+        # Check workaround mappings for specific devices.
+        if specific_sensor_key in DEVICE_MAPPINGS:
+            if DEVICE_MAPPINGS[specific_sensor_key] == WORKAROUND_IGNORE:
+                return
 
     # Generic Device mappings
-    elif value.command_class == COMMAND_CLASS_SENSOR_MULTILEVEL:
+    if value.command_class == COMMAND_CLASS_SENSOR_MULTILEVEL:
         add_devices([ZWaveMultilevelSensor(value)])
 
     elif (value.command_class == COMMAND_CLASS_METER and

homeassistant/components/wemo.py

@@ -58,12 +58,12 @@ def setup(hass, config):
     def discovery_dispatch(service, discovery_info):
         """Dispatcher for WeMo discovery events."""
         # name, model, location, mac
-        _, model_name, _, mac = discovery_info
+        _, model_name, url, _ = discovery_info
 
         # Only register a device once
-        if mac in KNOWN_DEVICES:
+        if url in KNOWN_DEVICES:
             return
-        KNOWN_DEVICES.append(mac)
+        KNOWN_DEVICES.append(url)
 
         service = WEMO_MODEL_DISPATCH.get(model_name) or DISCOVER_SWITCHES
         component = WEMO_SERVICE_DISPATCH.get(service)
@@ -77,7 +77,8 @@ def setup(hass, config):
     devices = [(device.host, device) for device in pywemo.discover_devices()]
 
     # Add static devices from the config file
-    devices.extend((address, None) for address in config.get('static', []))
+    devices.extend((address, None)
+                   for address in config.get(DOMAIN, {}).get('static', []))
 
     for address, device in devices:
         port = pywemo.ouimeaux_device.probe_wemo(address)

homeassistant/const.py

@@ -1,7 +1,7 @@
 # coding: utf-8
 """Constants used by Home Assistant components."""
 
-__version__ = "0.14.0"
+__version__ = "0.14.2"
 
 # Can be used to specify a catch all when registering state or event listeners.
 MATCH_ALL = '*'