From d01a62fec5331ed141f7d013ed7903cc49758722 Mon Sep 17 00:00:00 2001 From: mkmer Date: Tue, 10 Jan 2023 12:44:57 -0500 Subject: [PATCH] Bump AIOAladdinConnect to 0.1.52 (#85632) --- homeassistant/components/aladdin_connect/__init__.py | 8 ++++---- .../components/aladdin_connect/config_flow.py | 12 ++++++------ .../components/aladdin_connect/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/homeassistant/components/aladdin_connect/__init__.py b/homeassistant/components/aladdin_connect/__init__.py index e66efc1b0ab..3df3c0dbe0a 100644 --- a/homeassistant/components/aladdin_connect/__init__.py +++ b/homeassistant/components/aladdin_connect/__init__.py @@ -4,8 +4,8 @@ import logging from typing import Final from AIOAladdinConnect import AladdinConnectClient -from AIOAladdinConnect.session_manager import InvalidPasswordError -from aiohttp import ClientConnectionError +import AIOAladdinConnect.session_manager as Aladdin +from aiohttp import ClientError from homeassistant.config_entries import ConfigEntry from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform @@ -29,9 +29,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: ) try: await acc.login() - except (ClientConnectionError, asyncio.TimeoutError) as ex: + except (ClientError, asyncio.TimeoutError, Aladdin.ConnectionError) as ex: raise ConfigEntryNotReady("Can not connect to host") from ex - except InvalidPasswordError as ex: + except Aladdin.InvalidPasswordError as ex: raise ConfigEntryAuthFailed("Incorrect Password") from ex hass.data.setdefault(DOMAIN, {})[entry.entry_id] = acc diff --git a/homeassistant/components/aladdin_connect/config_flow.py b/homeassistant/components/aladdin_connect/config_flow.py index 1bfa9757907..eb201182b68 100644 --- a/homeassistant/components/aladdin_connect/config_flow.py +++ b/homeassistant/components/aladdin_connect/config_flow.py @@ -7,8 +7,8 @@ import logging from typing import Any from AIOAladdinConnect import AladdinConnectClient -from AIOAladdinConnect.session_manager import InvalidPasswordError -from aiohttp.client_exceptions import ClientConnectionError +import AIOAladdinConnect.session_manager as Aladdin +from aiohttp.client_exceptions import ClientError import voluptuous as vol from homeassistant import config_entries @@ -45,10 +45,10 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> None: ) try: await acc.login() - except (ClientConnectionError, asyncio.TimeoutError) as ex: + except (ClientError, asyncio.TimeoutError, Aladdin.ConnectionError) as ex: raise ex - except InvalidPasswordError as ex: + except Aladdin.InvalidPasswordError as ex: raise InvalidAuth from ex @@ -84,7 +84,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): except InvalidAuth: errors["base"] = "invalid_auth" - except (ClientConnectionError, asyncio.TimeoutError): + except (ClientError, asyncio.TimeoutError, Aladdin.ConnectionError): errors["base"] = "cannot_connect" else: @@ -121,7 +121,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): except InvalidAuth: errors["base"] = "invalid_auth" - except (ClientConnectionError, asyncio.TimeoutError): + except (ClientError, asyncio.TimeoutError, Aladdin.ConnectionError): errors["base"] = "cannot_connect" else: diff --git a/homeassistant/components/aladdin_connect/manifest.json b/homeassistant/components/aladdin_connect/manifest.json index 17ae963bb27..34a7abc95eb 100644 --- a/homeassistant/components/aladdin_connect/manifest.json +++ b/homeassistant/components/aladdin_connect/manifest.json @@ -2,7 +2,7 @@ "domain": "aladdin_connect", "name": "Aladdin Connect", "documentation": "https://www.home-assistant.io/integrations/aladdin_connect", - "requirements": ["AIOAladdinConnect==0.1.50"], + "requirements": ["AIOAladdinConnect==0.1.52"], "codeowners": ["@mkmer"], "iot_class": "cloud_polling", "loggers": ["aladdin_connect"], diff --git a/requirements_all.txt b/requirements_all.txt index 87022286566..2d338720edb 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -5,7 +5,7 @@ AEMET-OpenData==0.2.1 # homeassistant.components.aladdin_connect -AIOAladdinConnect==0.1.50 +AIOAladdinConnect==0.1.52 # homeassistant.components.adax Adax-local==0.1.5 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 2c0bc40571f..5d94a09cd8e 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -7,7 +7,7 @@ AEMET-OpenData==0.2.1 # homeassistant.components.aladdin_connect -AIOAladdinConnect==0.1.50 +AIOAladdinConnect==0.1.52 # homeassistant.components.adax Adax-local==0.1.5