From 0214511b383204ef42ffaa930b61438a09a28a86 Mon Sep 17 00:00:00 2001 From: Joost Lekkerkerker Date: Fri, 5 Apr 2024 21:38:11 +0200 Subject: [PATCH] Make config flow imports consistent (#114962) * Make config flow imports consistent * Fix --- homeassistant/components/airtouch5/config_flow.py | 6 +++--- homeassistant/components/aprilaire/config_flow.py | 6 +++--- homeassistant/components/bring/config_flow.py | 6 +++--- homeassistant/components/elvia/config_flow.py | 10 +++++----- homeassistant/components/eq3btsmart/config_flow.py | 5 ++--- homeassistant/components/fyta/config_flow.py | 6 +++--- homeassistant/components/huum/config_flow.py | 6 +++--- homeassistant/components/lupusec/config_flow.py | 10 ++++------ homeassistant/components/microbees/config_flow.py | 9 ++++----- homeassistant/components/rabbitair/config_flow.py | 8 ++++---- homeassistant/components/romy/config_flow.py | 14 +++++++------- homeassistant/components/rova/config_flow.py | 10 ++++------ .../components/seventeentrack/config_flow.py | 7 +++---- homeassistant/components/teslemetry/config_flow.py | 6 +++--- .../components/traccar_server/config_flow.py | 7 ++++--- homeassistant/components/velux/config_flow.py | 10 ++++------ .../components/weatherflow_cloud/config_flow.py | 8 ++++---- tests/components/aprilaire/test_config_flow.py | 8 ++++---- 18 files changed, 67 insertions(+), 75 deletions(-) diff --git a/homeassistant/components/airtouch5/config_flow.py b/homeassistant/components/airtouch5/config_flow.py index 65755350b47..3c4671cf54e 100644 --- a/homeassistant/components/airtouch5/config_flow.py +++ b/homeassistant/components/airtouch5/config_flow.py @@ -8,7 +8,7 @@ from typing import Any from airtouch5py.airtouch5_simple_client import Airtouch5SimpleClient import voluptuous as vol -from homeassistant import config_entries +from homeassistant.config_entries import ConfigFlow, ConfigFlowResult from homeassistant.const import CONF_HOST from .const import DOMAIN @@ -18,14 +18,14 @@ _LOGGER = logging.getLogger(__name__) STEP_USER_DATA_SCHEMA = vol.Schema({vol.Required(CONF_HOST): str}) -class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): +class AirTouch5ConfigFlow(ConfigFlow, domain=DOMAIN): """Handle a config flow for Airtouch 5.""" VERSION = 1 async def async_step_user( self, user_input: dict[str, Any] | None = None - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Handle the initial step.""" errors: dict[str, str] | None = None if user_input is not None: diff --git a/homeassistant/components/aprilaire/config_flow.py b/homeassistant/components/aprilaire/config_flow.py index 14437e5f3f2..4acc1b9dd9e 100644 --- a/homeassistant/components/aprilaire/config_flow.py +++ b/homeassistant/components/aprilaire/config_flow.py @@ -8,7 +8,7 @@ from typing import Any from pyaprilaire.const import Attribute import voluptuous as vol -from homeassistant import config_entries +from homeassistant.config_entries import ConfigFlow, ConfigFlowResult from homeassistant.const import CONF_HOST, CONF_PORT import homeassistant.helpers.config_validation as cv from homeassistant.helpers.device_registry import format_mac @@ -26,14 +26,14 @@ STEP_USER_DATA_SCHEMA = vol.Schema( _LOGGER = logging.getLogger(__name__) -class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): +class AprilaireConfigFlow(ConfigFlow, domain=DOMAIN): """Handle a config flow for Aprilaire.""" VERSION = 1 async def async_step_user( self, user_input: dict[str, Any] | None = None - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Handle the initial step.""" if user_input is None: diff --git a/homeassistant/components/bring/config_flow.py b/homeassistant/components/bring/config_flow.py index 0b423f5af36..1fbddeb7bfe 100644 --- a/homeassistant/components/bring/config_flow.py +++ b/homeassistant/components/bring/config_flow.py @@ -9,7 +9,7 @@ from bring_api.bring import Bring from bring_api.exceptions import BringAuthException, BringRequestException import voluptuous as vol -from homeassistant import config_entries +from homeassistant.config_entries import ConfigFlow, ConfigFlowResult from homeassistant.const import CONF_EMAIL, CONF_PASSWORD from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.selector import ( @@ -38,14 +38,14 @@ STEP_USER_DATA_SCHEMA = vol.Schema( ) -class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): +class BringConfigFlow(ConfigFlow, domain=DOMAIN): """Handle a config flow for Bring!.""" VERSION = 1 async def async_step_user( self, user_input: dict[str, Any] | None = None - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Handle the initial step.""" errors: dict[str, str] = {} if user_input is not None: diff --git a/homeassistant/components/elvia/config_flow.py b/homeassistant/components/elvia/config_flow.py index 4cf311e780e..2db6e4bb2b5 100644 --- a/homeassistant/components/elvia/config_flow.py +++ b/homeassistant/components/elvia/config_flow.py @@ -8,14 +8,14 @@ from typing import TYPE_CHECKING, Any from elvia import Elvia, error as ElviaError import voluptuous as vol -from homeassistant import config_entries +from homeassistant.config_entries import ConfigFlow, ConfigFlowResult from homeassistant.const import CONF_API_TOKEN from homeassistant.util import dt as dt_util from .const import CONF_METERING_POINT_ID, DOMAIN, LOGGER -class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): +class ElviaConfigFlow(ConfigFlow, domain=DOMAIN): """Handle a config flow for Elvia.""" def __init__(self) -> None: @@ -26,7 +26,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): async def async_step_user( self, user_input: dict[str, Any] | None = None, - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Handle the initial step.""" errors: dict[str, str] = {} if user_input is not None: @@ -75,7 +75,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): async def async_step_select_meter( self, user_input: dict[str, Any] | None = None - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Handle selecting a metering point ID.""" if TYPE_CHECKING: assert self._metering_point_ids is not None @@ -103,7 +103,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): self, api_token: str, metering_point_id: str, - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Store metering point ID and API token.""" if (await self.async_set_unique_id(metering_point_id)) is not None: return self.async_abort( diff --git a/homeassistant/components/eq3btsmart/config_flow.py b/homeassistant/components/eq3btsmart/config_flow.py index 228127d7705..4dccd8a572a 100644 --- a/homeassistant/components/eq3btsmart/config_flow.py +++ b/homeassistant/components/eq3btsmart/config_flow.py @@ -2,9 +2,8 @@ from typing import Any -from homeassistant import config_entries from homeassistant.components.bluetooth import BluetoothServiceInfoBleak -from homeassistant.config_entries import ConfigFlowResult +from homeassistant.config_entries import ConfigFlow, ConfigFlowResult from homeassistant.const import CONF_MAC from homeassistant.helpers.device_registry import format_mac from homeassistant.util import slugify @@ -13,7 +12,7 @@ from .const import DOMAIN from .schemas import SCHEMA_MAC -class EQ3ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): +class EQ3ConfigFlow(ConfigFlow, domain=DOMAIN): """Config flow for eQ-3 Bluetooth Smart thermostats.""" def __init__(self) -> None: diff --git a/homeassistant/components/fyta/config_flow.py b/homeassistant/components/fyta/config_flow.py index 67e46f8125e..8419352dc44 100644 --- a/homeassistant/components/fyta/config_flow.py +++ b/homeassistant/components/fyta/config_flow.py @@ -13,7 +13,7 @@ from fyta_cli.fyta_exceptions import ( ) import voluptuous as vol -from homeassistant import config_entries +from homeassistant.config_entries import ConfigFlow, ConfigFlowResult from homeassistant.const import CONF_PASSWORD, CONF_USERNAME from .const import DOMAIN @@ -26,14 +26,14 @@ DATA_SCHEMA = vol.Schema( ) -class FytaConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): +class FytaConfigFlow(ConfigFlow, domain=DOMAIN): """Handle a config flow for Fyta.""" VERSION = 1 async def async_step_user( self, user_input: dict[str, Any] | None = None - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Handle the initial step.""" errors = {} diff --git a/homeassistant/components/huum/config_flow.py b/homeassistant/components/huum/config_flow.py index e2ea2a7dbe1..5de94260a4b 100644 --- a/homeassistant/components/huum/config_flow.py +++ b/homeassistant/components/huum/config_flow.py @@ -9,7 +9,7 @@ from huum.exceptions import Forbidden, NotAuthenticated from huum.huum import Huum import voluptuous as vol -from homeassistant import config_entries +from homeassistant.config_entries import ConfigFlow, ConfigFlowResult from homeassistant.const import CONF_PASSWORD, CONF_USERNAME from homeassistant.helpers.aiohttp_client import async_get_clientsession @@ -25,14 +25,14 @@ STEP_USER_DATA_SCHEMA = vol.Schema( ) -class HuumConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): +class HuumConfigFlow(ConfigFlow, domain=DOMAIN): """Handle a config flow for huum.""" VERSION = 1 async def async_step_user( self, user_input: dict[str, Any] | None = None - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Handle the initial step.""" errors = {} if user_input is not None: diff --git a/homeassistant/components/lupusec/config_flow.py b/homeassistant/components/lupusec/config_flow.py index c3fe7295266..3af823e4fa1 100644 --- a/homeassistant/components/lupusec/config_flow.py +++ b/homeassistant/components/lupusec/config_flow.py @@ -7,7 +7,7 @@ from typing import Any import lupupy import voluptuous as vol -from homeassistant import config_entries +from homeassistant.config_entries import ConfigFlow, ConfigFlowResult from homeassistant.const import ( CONF_HOST, CONF_IP_ADDRESS, @@ -31,12 +31,12 @@ DATA_SCHEMA = vol.Schema( ) -class LupusecConfigFlowHandler(config_entries.ConfigFlow, domain=DOMAIN): +class LupusecConfigFlowHandler(ConfigFlow, domain=DOMAIN): """Lupusec config flow.""" async def async_step_user( self, user_input: dict[str, Any] | None = None - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Handle a flow initiated by the user.""" errors = {} @@ -66,9 +66,7 @@ class LupusecConfigFlowHandler(config_entries.ConfigFlow, domain=DOMAIN): step_id="user", data_schema=DATA_SCHEMA, errors=errors ) - async def async_step_import( - self, user_input: dict[str, Any] - ) -> config_entries.ConfigFlowResult: + async def async_step_import(self, user_input: dict[str, Any]) -> ConfigFlowResult: """Import the yaml config.""" self._async_abort_entries_match( { diff --git a/homeassistant/components/microbees/config_flow.py b/homeassistant/components/microbees/config_flow.py index dedb6c1f374..c54f8939145 100644 --- a/homeassistant/components/microbees/config_flow.py +++ b/homeassistant/components/microbees/config_flow.py @@ -7,6 +7,7 @@ from typing import Any from microBeesPy import MicroBees, MicroBeesException from homeassistant import config_entries +from homeassistant.config_entries import ConfigFlowResult from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN from homeassistant.helpers import aiohttp_client, config_entry_oauth2_flow @@ -32,9 +33,7 @@ class OAuth2FlowHandler( scopes = ["read", "write"] return {"scope": " ".join(scopes)} - async def async_oauth_create_entry( - self, data: dict[str, Any] - ) -> config_entries.ConfigFlowResult: + async def async_oauth_create_entry(self, data: dict[str, Any]) -> ConfigFlowResult: """Create an oauth config entry or update existing entry for reauth.""" microbees = MicroBees( @@ -65,7 +64,7 @@ class OAuth2FlowHandler( async def async_step_reauth( self, entry_data: Mapping[str, Any] - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Perform reauth upon an API authentication error.""" self.reauth_entry = self.hass.config_entries.async_get_entry( self.context["entry_id"] @@ -74,7 +73,7 @@ class OAuth2FlowHandler( async def async_step_reauth_confirm( self, user_input: dict[str, Any] | None = None - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Confirm reauth dialog.""" if user_input is None: return self.async_show_form(step_id="reauth_confirm") diff --git a/homeassistant/components/rabbitair/config_flow.py b/homeassistant/components/rabbitair/config_flow.py index 30dfac93236..6bf48995412 100644 --- a/homeassistant/components/rabbitair/config_flow.py +++ b/homeassistant/components/rabbitair/config_flow.py @@ -8,8 +8,8 @@ from typing import Any from rabbitair import UdpClient import voluptuous as vol -from homeassistant import config_entries from homeassistant.components import zeroconf +from homeassistant.config_entries import ConfigFlow, ConfigFlowResult from homeassistant.const import CONF_ACCESS_TOKEN, CONF_HOST, CONF_MAC from homeassistant.core import HomeAssistant from homeassistant.exceptions import HomeAssistantError @@ -49,7 +49,7 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str, return {"mac": info.mac} -class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): +class RabbitAirConfigFlow(ConfigFlow, domain=DOMAIN): """Handle a config flow for Rabbit Air.""" VERSION = 1 @@ -58,7 +58,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): async def async_step_user( self, user_input: dict[str, Any] | None = None - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Handle the initial step.""" errors = {} @@ -100,7 +100,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): async def async_step_zeroconf( self, discovery_info: zeroconf.ZeroconfServiceInfo - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Handle zeroconf discovery.""" mac = dr.format_mac(discovery_info.properties["id"]) await self.async_set_unique_id(mac) diff --git a/homeassistant/components/romy/config_flow.py b/homeassistant/components/romy/config_flow.py index bccae667695..e571ff41c9a 100644 --- a/homeassistant/components/romy/config_flow.py +++ b/homeassistant/components/romy/config_flow.py @@ -5,15 +5,15 @@ from __future__ import annotations import romy import voluptuous as vol -from homeassistant import config_entries from homeassistant.components import zeroconf +from homeassistant.config_entries import ConfigFlow, ConfigFlowResult from homeassistant.const import CONF_HOST, CONF_PASSWORD import homeassistant.helpers.config_validation as cv from .const import DOMAIN, LOGGER -class RomyConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): +class RomyConfigFlow(ConfigFlow, domain=DOMAIN): """Handle config flow for ROMY.""" VERSION = 1 @@ -26,7 +26,7 @@ class RomyConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): async def async_step_user( self, user_input: dict[str, str] | None = None - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Handle the user step.""" errors: dict[str, str] = {} @@ -59,7 +59,7 @@ class RomyConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): async def async_step_password( self, user_input: dict[str, str] | None = None - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Unlock the robots local http interface with password.""" errors: dict[str, str] = {} @@ -85,7 +85,7 @@ class RomyConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): async def async_step_zeroconf( self, discovery_info: zeroconf.ZeroconfServiceInfo - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Handle zeroconf discovery.""" LOGGER.debug("Zeroconf discovery_info: %s", discovery_info) @@ -125,7 +125,7 @@ class RomyConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): async def async_step_zeroconf_confirm( self, user_input: dict[str, str] | None = None - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Handle a confirmation flow initiated by zeroconf.""" if user_input is None: return self.async_show_form( @@ -137,7 +137,7 @@ class RomyConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): ) return await self._async_step_finish_config() - async def _async_step_finish_config(self) -> config_entries.ConfigFlowResult: + async def _async_step_finish_config(self) -> ConfigFlowResult: """Finish the configuration setup.""" return self.async_create_entry( title=self.robot_name_given_by_user, diff --git a/homeassistant/components/rova/config_flow.py b/homeassistant/components/rova/config_flow.py index d618681783e..e5e3a31b8af 100644 --- a/homeassistant/components/rova/config_flow.py +++ b/homeassistant/components/rova/config_flow.py @@ -6,19 +6,19 @@ from requests.exceptions import ConnectTimeout, HTTPError from rova.rova import Rova import voluptuous as vol -from homeassistant import config_entries +from homeassistant.config_entries import ConfigFlow, ConfigFlowResult from .const import CONF_HOUSE_NUMBER, CONF_HOUSE_NUMBER_SUFFIX, CONF_ZIP_CODE, DOMAIN -class RovaConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): +class RovaConfigFlow(ConfigFlow, domain=DOMAIN): """Handle Rova config flow.""" VERSION = 1 async def async_step_user( self, user_input: dict[str, Any] | None = None - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Step when user initializes a integration.""" errors: dict[str, str] = {} @@ -60,9 +60,7 @@ class RovaConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): errors=errors, ) - async def async_step_import( - self, user_input: dict[str, Any] - ) -> config_entries.ConfigFlowResult: + async def async_step_import(self, user_input: dict[str, Any]) -> ConfigFlowResult: """Import the yaml config.""" zip_code = user_input[CONF_ZIP_CODE] number = user_input[CONF_HOUSE_NUMBER] diff --git a/homeassistant/components/seventeentrack/config_flow.py b/homeassistant/components/seventeentrack/config_flow.py index ae31e1962d7..f54e7e94ac2 100644 --- a/homeassistant/components/seventeentrack/config_flow.py +++ b/homeassistant/components/seventeentrack/config_flow.py @@ -9,8 +9,7 @@ from py17track import Client as SeventeenTrackClient from py17track.errors import SeventeenTrackError import voluptuous as vol -from homeassistant import config_entries -from homeassistant.config_entries import ConfigFlowResult +from homeassistant.config_entries import ConfigEntry, ConfigFlow, ConfigFlowResult from homeassistant.const import CONF_PASSWORD, CONF_USERNAME from homeassistant.core import callback from homeassistant.helpers import aiohttp_client @@ -47,7 +46,7 @@ USER_SCHEMA = vol.Schema( ) -class SeventeenTrackConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): +class SeventeenTrackConfigFlow(ConfigFlow, domain=DOMAIN): """17track config flow.""" VERSION = 1 @@ -55,7 +54,7 @@ class SeventeenTrackConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): @staticmethod @callback def async_get_options_flow( - config_entry: config_entries.ConfigEntry, + config_entry: ConfigEntry, ) -> SchemaOptionsFlowHandler: """Get options flow for this handler.""" return SchemaOptionsFlowHandler(config_entry, OPTIONS_FLOW) diff --git a/homeassistant/components/teslemetry/config_flow.py b/homeassistant/components/teslemetry/config_flow.py index f7fc5bbf805..0803688b1ca 100644 --- a/homeassistant/components/teslemetry/config_flow.py +++ b/homeassistant/components/teslemetry/config_flow.py @@ -14,7 +14,7 @@ from tesla_fleet_api.exceptions import ( ) import voluptuous as vol -from homeassistant import config_entries +from homeassistant.config_entries import ConfigFlow, ConfigFlowResult from homeassistant.const import CONF_ACCESS_TOKEN from homeassistant.helpers.aiohttp_client import async_get_clientsession @@ -27,14 +27,14 @@ DESCRIPTION_PLACEHOLDERS = { } -class TeslemetryConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): +class TeslemetryConfigFlow(ConfigFlow, domain=DOMAIN): """Config Teslemetry API connection.""" VERSION = 1 async def async_step_user( self, user_input: Mapping[str, Any] | None = None - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Get configuration from the user.""" errors: dict[str, str] = {} if user_input: diff --git a/homeassistant/components/traccar_server/config_flow.py b/homeassistant/components/traccar_server/config_flow.py index 0fa97c8100e..678bcc461e7 100644 --- a/homeassistant/components/traccar_server/config_flow.py +++ b/homeassistant/components/traccar_server/config_flow.py @@ -9,6 +9,7 @@ from pytraccar import ApiClient, ServerModel, TraccarException import voluptuous as vol from homeassistant import config_entries +from homeassistant.config_entries import ConfigFlow, ConfigFlowResult from homeassistant.const import ( CONF_HOST, CONF_PASSWORD, @@ -111,7 +112,7 @@ OPTIONS_FLOW = { } -class TraccarServerConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): +class TraccarServerConfigFlow(ConfigFlow, domain=DOMAIN): """Handle a config flow for Traccar Server.""" async def _get_server_info(self, user_input: dict[str, Any]) -> ServerModel: @@ -130,7 +131,7 @@ class TraccarServerConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): async def async_step_user( self, user_input: dict[str, Any] | None = None, - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Handle the initial step.""" errors: dict[str, str] = {} if user_input is not None: @@ -162,7 +163,7 @@ class TraccarServerConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): async def async_step_import( self, import_info: Mapping[str, Any] - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Import an entry.""" configured_port = str(import_info[CONF_PORT]) self._async_abort_entries_match( diff --git a/homeassistant/components/velux/config_flow.py b/homeassistant/components/velux/config_flow.py index da6502b86da..679af4bd20a 100644 --- a/homeassistant/components/velux/config_flow.py +++ b/homeassistant/components/velux/config_flow.py @@ -5,7 +5,7 @@ from typing import Any from pyvlx import PyVLX, PyVLXException import voluptuous as vol -from homeassistant import config_entries +from homeassistant.config_entries import ConfigFlow, ConfigFlowResult from homeassistant.const import CONF_HOST, CONF_PASSWORD from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN import homeassistant.helpers.config_validation as cv @@ -21,12 +21,10 @@ DATA_SCHEMA = vol.Schema( ) -class VeluxConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): +class VeluxConfigFlow(ConfigFlow, domain=DOMAIN): """Handle a config flow for velux.""" - async def async_step_import( - self, config: dict[str, Any] - ) -> config_entries.ConfigFlowResult: + async def async_step_import(self, config: dict[str, Any]) -> ConfigFlowResult: """Import a config entry.""" def create_repair(error: str | None = None) -> None: @@ -81,7 +79,7 @@ class VeluxConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): async def async_step_user( self, user_input: dict[str, str] | None = None - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Handle the initial step.""" errors: dict[str, str] = {} diff --git a/homeassistant/components/weatherflow_cloud/config_flow.py b/homeassistant/components/weatherflow_cloud/config_flow.py index 6e6212042e1..4c905a8451e 100644 --- a/homeassistant/components/weatherflow_cloud/config_flow.py +++ b/homeassistant/components/weatherflow_cloud/config_flow.py @@ -9,7 +9,7 @@ from aiohttp import ClientResponseError import voluptuous as vol from weatherflow4py.api import WeatherFlowRestAPI -from homeassistant import config_entries +from homeassistant.config_entries import ConfigFlow, ConfigFlowResult from homeassistant.const import CONF_API_TOKEN from .const import DOMAIN @@ -27,14 +27,14 @@ async def _validate_api_token(api_token: str) -> dict[str, Any]: return {} -class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): +class WeatherFlowCloudConfigFlow(ConfigFlow, domain=DOMAIN): """Handle a config flow for WeatherFlowCloud.""" VERSION = 1 async def async_step_reauth( self, user_input: Mapping[str, Any] - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Handle a flow for reauth.""" errors = {} @@ -60,7 +60,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): async def async_step_user( self, user_input: dict[str, Any] | None = None - ) -> config_entries.ConfigFlowResult: + ) -> ConfigFlowResult: """Handle a flow initialized by the user.""" errors = {} diff --git a/tests/components/aprilaire/test_config_flow.py b/tests/components/aprilaire/test_config_flow.py index 6508379665b..c9cba2b3fd6 100644 --- a/tests/components/aprilaire/test_config_flow.py +++ b/tests/components/aprilaire/test_config_flow.py @@ -8,7 +8,7 @@ import pytest from homeassistant.components.aprilaire.config_flow import ( STEP_USER_DATA_SCHEMA, - ConfigFlow, + AprilaireConfigFlow, ) from homeassistant.core import HomeAssistant @@ -24,7 +24,7 @@ async def test_user_input_step() -> None: show_form_mock = Mock() - config_flow = ConfigFlow() + config_flow = AprilaireConfigFlow() config_flow.async_show_form = show_form_mock await config_flow.async_step_user(None) @@ -41,7 +41,7 @@ async def test_config_flow_invalid_data(client: AprilaireClient) -> None: set_unique_id_mock = AsyncMock() async_abort_entries_match_mock = Mock() - config_flow = ConfigFlow() + config_flow = AprilaireConfigFlow() config_flow.async_show_form = show_form_mock config_flow.async_set_unique_id = set_unique_id_mock config_flow._async_abort_entries_match = async_abort_entries_match_mock @@ -77,7 +77,7 @@ async def test_config_flow_data(client: AprilaireClient, hass: HomeAssistant) -> abort_if_unique_id_configured_mock = Mock() create_entry_mock = Mock() - config_flow = ConfigFlow() + config_flow = AprilaireConfigFlow() config_flow.hass = hass config_flow.async_show_form = show_form_mock config_flow.async_set_unique_id = set_unique_id_mock