Skip to content

Commit

Permalink
Fix setting config_entry directly in ≥2024.12 (#1155)
Browse files Browse the repository at this point in the history
* Fix setting config_entry directly in ≥2024.12

FAILED tests/components/adaptive_lighting/test_config_flow.py::test_incorrect_options - RuntimeError: Detected that integration 'adaptive_lighting' sets option flow config_entry explicitly, which is deprecated at homeassistant/components/adaptive_lighting/config_flow.py, line 86: self.config_entry = config_entry. Please create a bug report at https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue+label%3A%22integration%3A+adaptive_lighting%22

* compatiblity
  • Loading branch information
basnijholt authored Jan 2, 2025
1 parent 32482c4 commit 72eb848
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions custom_components/adaptive_lighting/config_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import homeassistant.helpers.config_validation as cv
import voluptuous as vol
from homeassistant import config_entries
from homeassistant.const import CONF_NAME
from homeassistant.const import CONF_NAME, MAJOR_VERSION, MINOR_VERSION
from homeassistant.core import callback

from .const import ( # pylint: disable=unused-import
Expand Down Expand Up @@ -58,6 +58,9 @@ async def async_step_import(self, user_input=None):
@callback
def async_get_options_flow(config_entry):
"""Get the options flow for this handler."""
if (MAJOR_VERSION, MINOR_VERSION) >= (2024, 12):
# https://github.com/home-assistant/core/pull/129651
return OptionsFlowHandler()
return OptionsFlowHandler(config_entry)


Expand All @@ -81,9 +84,13 @@ def validate_options(user_input, errors):
class OptionsFlowHandler(config_entries.OptionsFlow):
"""Handle a option flow for Adaptive Lighting."""

def __init__(self, config_entry: config_entries.ConfigEntry) -> None:
def __init__(self, *args, **kwargs) -> None:
"""Initialize options flow."""
self.config_entry = config_entry
if (MAJOR_VERSION, MINOR_VERSION) >= (2024, 12):
super().__init__(*args, **kwargs)
# https://github.com/home-assistant/core/pull/129651
else:
self.config_entry = args[0]

async def async_step_init(self, user_input=None):
"""Handle options flow."""
Expand Down

0 comments on commit 72eb848

Please sign in to comment.