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

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

View File

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