Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup deprecated OptionsFlowWithConfigEntry (part 2) (#129754)

pull/129829/head
epenet 2024-11-04 18:55:49 +01:00 committed by GitHub
parent d180ff417d
commit cc4fae10f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
homeassistant/components/androidtv/config_flow.py
View File

@ -13,7 +13,7 @@ from homeassistant.config_entries import (
ConfigEntry, ConfigEntry,
ConfigFlow, ConfigFlow,
ConfigFlowResult, ConfigFlowResult,
OptionsFlowWithConfigEntry, OptionsFlow,
) )
from homeassistant.const import CONF_DEVICE_CLASS, CONF_HOST, CONF_PORT from homeassistant.const import CONF_DEVICE_CLASS, CONF_HOST, CONF_PORT
from homeassistant.core import callback from homeassistant.core import callback
@ -186,13 +186,12 @@ class AndroidTVFlowHandler(ConfigFlow, domain=DOMAIN):
return OptionsFlowHandler(config_entry) return OptionsFlowHandler(config_entry)
class OptionsFlowHandler(OptionsFlowWithConfigEntry): class OptionsFlowHandler(OptionsFlow):
"""Handle an option flow for Android Debug Bridge.""" """Handle an option flow for Android Debug Bridge."""
def __init__(self, config_entry: ConfigEntry) -> None: def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow.""" """Initialize options flow."""
super().__init__(config_entry) self.initialize_options(config_entry)
self._apps: dict[str, Any] = self.options.setdefault(CONF_APPS, {}) self._apps: dict[str, Any] = self.options.setdefault(CONF_APPS, {})
self._state_det_rules: dict[str, Any] = self.options.setdefault( self._state_det_rules: dict[str, Any] = self.options.setdefault(
CONF_STATE_DETECTION_RULES, {} CONF_STATE_DETECTION_RULES, {}

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

@ -20,7 +20,7 @@ from homeassistant.config_entries import (
ConfigEntry, ConfigEntry,
ConfigFlow, ConfigFlow,
ConfigFlowResult, ConfigFlowResult,
OptionsFlowWithConfigEntry, OptionsFlow,
) )
from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME
from homeassistant.core import callback from homeassistant.core import callback
@ -221,12 +221,12 @@ class AndroidTVRemoteConfigFlow(ConfigFlow, domain=DOMAIN):
return AndroidTVRemoteOptionsFlowHandler(config_entry) return AndroidTVRemoteOptionsFlowHandler(config_entry)
class AndroidTVRemoteOptionsFlowHandler(OptionsFlowWithConfigEntry): class AndroidTVRemoteOptionsFlowHandler(OptionsFlow):
"""Android TV Remote options flow.""" """Android TV Remote options flow."""
def __init__(self, config_entry: ConfigEntry) -> None: def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow.""" """Initialize options flow."""
super().__init__(config_entry) self.initialize_options(config_entry)
self._apps: dict[str, Any] = self.options.setdefault(CONF_APPS, {}) self._apps: dict[str, Any] = self.options.setdefault(CONF_APPS, {})
self._conf_app_id: str | None = None self._conf_app_id: str | None = None

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

@ -14,7 +14,6 @@ from homeassistant.config_entries import (
ConfigFlow, ConfigFlow,
ConfigFlowResult, ConfigFlowResult,
OptionsFlow, OptionsFlow,
OptionsFlowWithConfigEntry,
) )
from homeassistant.const import CONF_API_KEY from homeassistant.const import CONF_API_KEY
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
@ -103,13 +102,12 @@ class ElevenLabsConfigFlow(ConfigFlow, domain=DOMAIN):
return ElevenLabsOptionsFlow(config_entry) return ElevenLabsOptionsFlow(config_entry)
class ElevenLabsOptionsFlow(OptionsFlowWithConfigEntry): class ElevenLabsOptionsFlow(OptionsFlow):
"""ElevenLabs options flow.""" """ElevenLabs options flow."""
def __init__(self, config_entry: ConfigEntry) -> None: def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow.""" """Initialize options flow."""
super().__init__(config_entry) self.api_key: str = config_entry.data[CONF_API_KEY]
self.api_key: str = self.config_entry.data[CONF_API_KEY]
# id -> name # id -> name
self.voices: dict[str, str] = {} self.voices: dict[str, str] = {}
self.models: dict[str, str] = {} self.models: dict[str, str] = {}

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

@ -11,7 +11,6 @@ from homeassistant.config_entries import (
ConfigFlow, ConfigFlow,
ConfigFlowResult, ConfigFlowResult,
OptionsFlow, OptionsFlow,
OptionsFlowWithConfigEntry,
) )
from homeassistant.const import CONF_HOST, CONF_NAME from homeassistant.const import CONF_HOST, CONF_NAME
from homeassistant.core import callback from homeassistant.core import callback
@ -323,13 +322,12 @@ class OnkyoConfigFlow(ConfigFlow, domain=DOMAIN):
return OnkyoOptionsFlowHandler(config_entry) return OnkyoOptionsFlowHandler(config_entry)
class OnkyoOptionsFlowHandler(OptionsFlowWithConfigEntry): class OnkyoOptionsFlowHandler(OptionsFlow):
"""Handle an options flow for Onkyo.""" """Handle an options flow for Onkyo."""
def __init__(self, config_entry: ConfigEntry) -> None: def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow.""" """Initialize options flow."""
super().__init__(config_entry) self.initialize_options(config_entry)
sources_store: dict[str, str] = self.options[OPTION_INPUT_SOURCES] sources_store: dict[str, str] = self.options[OPTION_INPUT_SOURCES]
sources = {InputSource(k): v for k, v in sources_store.items()} sources = {InputSource(k): v for k, v in sources_store.items()}
self.options[OPTION_INPUT_SOURCES] = sources self.options[OPTION_INPUT_SOURCES] = sources