jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-11 07:17:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix uncaught exception during WiZ discovery during firmware update (#66358)

Browse Source
This commit is contained in:
J. Nick Koston 2022-02-11 20:42:41 -06:00 committed by GitHub
parent 366609ea44
commit 578456bbb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
homeassistant/components/wiz/__init__.py
View File

@ -5,7 +5,6 @@ import logging
from typing import Any from typing import Any
from pywizlight import wizlight from pywizlight import wizlight
from pywizlight.exceptions import WizLightNotKnownBulb
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_HOST, Platform from homeassistant.const import CONF_HOST, Platform
@ -16,7 +15,13 @@ from homeassistant.helpers.event import async_track_time_interval
from homeassistant.helpers.typing import ConfigType from homeassistant.helpers.typing import ConfigType
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
from .const import DISCOVER_SCAN_TIMEOUT, DISCOVERY_INTERVAL, DOMAIN, WIZ_EXCEPTIONS from .const import (
DISCOVER_SCAN_TIMEOUT,
DISCOVERY_INTERVAL,
DOMAIN,
WIZ_CONNECT_EXCEPTIONS,
WIZ_EXCEPTIONS,
)
from .discovery import async_discover_devices, async_trigger_discovery from .discovery import async_discover_devices, async_trigger_discovery
from .models import WizData from .models import WizData
@ -48,7 +53,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
try: try:
scenes = await bulb.getSupportedScenes() scenes = await bulb.getSupportedScenes()
await bulb.getMac() await bulb.getMac()
except (WizLightNotKnownBulb, *WIZ_EXCEPTIONS) as err: except WIZ_CONNECT_EXCEPTIONS as err:
raise ConfigEntryNotReady(f"{ip_address}: {err}") from err raise ConfigEntryNotReady(f"{ip_address}: {err}") from err
async def _async_update() -> None: async def _async_update() -> None:

6
homeassistant/components/wiz/config_flow.py
View File

@ -15,7 +15,7 @@ from homeassistant.const import CONF_HOST
from homeassistant.data_entry_flow import AbortFlow, FlowResult from homeassistant.data_entry_flow import AbortFlow, FlowResult
from homeassistant.util.network import is_ip_address from homeassistant.util.network import is_ip_address
from .const import DEFAULT_NAME, DISCOVER_SCAN_TIMEOUT, DOMAIN, WIZ_EXCEPTIONS from .const import DEFAULT_NAME, DISCOVER_SCAN_TIMEOUT, DOMAIN, WIZ_CONNECT_EXCEPTIONS
from .discovery import async_discover_devices from .discovery import async_discover_devices
from .utils import _short_mac, name_from_bulb_type_and_mac from .utils import _short_mac, name_from_bulb_type_and_mac
@ -70,7 +70,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
bulb = wizlight(device.ip_address) bulb = wizlight(device.ip_address)
try: try:
bulbtype = await bulb.get_bulbtype() bulbtype = await bulb.get_bulbtype()
except WIZ_EXCEPTIONS as ex: except WIZ_CONNECT_EXCEPTIONS as ex:
raise AbortFlow("cannot_connect") from ex raise AbortFlow("cannot_connect") from ex
self._name = name_from_bulb_type_and_mac(bulbtype, device.mac_address) self._name = name_from_bulb_type_and_mac(bulbtype, device.mac_address)
@ -110,7 +110,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
bulb = wizlight(device.ip_address) bulb = wizlight(device.ip_address)
try: try:
bulbtype = await bulb.get_bulbtype() bulbtype = await bulb.get_bulbtype()
except WIZ_EXCEPTIONS: except WIZ_CONNECT_EXCEPTIONS:
return self.async_abort(reason="cannot_connect") return self.async_abort(reason="cannot_connect")
else: else:
return self.async_create_entry( return self.async_create_entry(

7
homeassistant/components/wiz/const.py
View File

@ -1,7 +1,11 @@
"""Constants for the WiZ Platform integration.""" """Constants for the WiZ Platform integration."""
from datetime import timedelta from datetime import timedelta
from pywizlight.exceptions import WizLightConnectionError, WizLightTimeOutError from pywizlight.exceptions import (
WizLightConnectionError,
WizLightNotKnownBulb,
WizLightTimeOutError,
)
DOMAIN = "wiz" DOMAIN = "wiz"
DEFAULT_NAME = "WiZ" DEFAULT_NAME = "WiZ"
@ -16,3 +20,4 @@ WIZ_EXCEPTIONS = (
WizLightConnectionError, WizLightConnectionError,
ConnectionRefusedError, ConnectionRefusedError,
) )
WIZ_CONNECT_EXCEPTIONS = (WizLightNotKnownBulb, *WIZ_EXCEPTIONS)