From 0876d5ccc21730e7362b5b9338f0f7b0b2cd42f5 Mon Sep 17 00:00:00 2001 From: Francesco Lo Faro Date: Sat, 2 Nov 2024 07:08:14 +0100 Subject: [PATCH] fix: use AlarmControlPanelState constants (#2657) Closes #2655 --- .../alexa_media/alarm_control_panel.py | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/custom_components/alexa_media/alarm_control_panel.py b/custom_components/alexa_media/alarm_control_panel.py index 92e9e8f3..f93b974c 100644 --- a/custom_components/alexa_media/alarm_control_panel.py +++ b/custom_components/alexa_media/alarm_control_panel.py @@ -12,12 +12,8 @@ from typing import List, Optional from alexapy import hide_email, hide_serial -from homeassistant.const import ( - CONF_EMAIL, - STATE_ALARM_ARMED_AWAY, - STATE_ALARM_DISARMED, - STATE_UNAVAILABLE, -) +from homeassistant.components.alarm_control_panel import AlarmControlPanelEntity +from homeassistant.const import CONF_EMAIL, STATE_UNAVAILABLE from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.helpers.update_coordinator import CoordinatorEntity @@ -34,13 +30,12 @@ from .helpers import _catch_login_errors, add_devices try: - from homeassistant.components.alarm_control_panel import ( - AlarmControlPanelEntity as AlarmControlPanel, - ) -except ImportError: - from homeassistant.components.alarm_control_panel import AlarmControlPanel - + from homeassistant.components.alarm_control_panel import AlarmControlPanelState + STATE_ALARM_ARMED_AWAY = AlarmControlPanelState.ARMED_AWAY + STATE_ALARM_DISARMED = AlarmControlPanelState.DISARMED +except ImportError: + from homeassistant.const import STATE_ALARM_ARMED_AWAY, STATE_ALARM_DISARMED _LOGGER = logging.getLogger(__name__) DEPENDENCIES = [ALEXA_DOMAIN] @@ -135,7 +130,7 @@ async def async_unload_entry(hass, entry) -> bool: return True -class AlexaAlarmControlPanel(AlarmControlPanel, AlexaMedia, CoordinatorEntity): +class AlexaAlarmControlPanel(AlarmControlPanelEntity, AlexaMedia, CoordinatorEntity): """Implementation of Alexa Media Player alarm control panel.""" def __init__(self, login, coordinator, guard_entity, media_players=None) -> None: @@ -224,8 +219,6 @@ def state(self): ) if _state == "ARMED_AWAY": return STATE_ALARM_ARMED_AWAY - if _state == "ARMED_STAY": - return STATE_ALARM_DISARMED return STATE_ALARM_DISARMED @property