Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
Paulus Schoutsen 2017-01-24 20:59:34 -08:00
commit d8e5e60a08

View File

@ -81,8 +81,7 @@ class UPCDeviceScanner(DeviceScanner):
except (ET.ParseError, TypeError):
_LOGGER.warning("Can't read device from %s", self.host)
self.token = None
return []
return []
@asyncio.coroutine
def async_get_device_name(self, device):