From 17236a56989ff82f6aba9a2231cfc88741709baf Mon Sep 17 00:00:00 2001 From: Manu <4445816+tr4nt0r@users.noreply.github.com> Date: Thu, 28 Nov 2024 08:08:00 +0100 Subject: [PATCH] Remove unreachable code in Habitica (#131778) --- homeassistant/components/habitica/button.py | 11 +++++------ homeassistant/components/habitica/calendar.py | 3 --- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/homeassistant/components/habitica/button.py b/homeassistant/components/habitica/button.py index 30e326f79a0..2b9a4199133 100644 --- a/homeassistant/components/habitica/button.py +++ b/homeassistant/components/habitica/button.py @@ -33,7 +33,7 @@ class HabiticaButtonEntityDescription(ButtonEntityDescription): """Describes Habitica button entity.""" press_fn: Callable[[HabiticaDataUpdateCoordinator], Any] - available_fn: Callable[[HabiticaData], bool] | None = None + available_fn: Callable[[HabiticaData], bool] class_needed: str | None = None entity_picture: str | None = None @@ -343,11 +343,10 @@ class HabiticaButton(HabiticaBase, ButtonEntity): @property def available(self) -> bool: """Is entity available.""" - if not super().available: - return False - if self.entity_description.available_fn: - return self.entity_description.available_fn(self.coordinator.data) - return True + + return super().available and self.entity_description.available_fn( + self.coordinator.data + ) @property def entity_picture(self) -> str | None: diff --git a/homeassistant/components/habitica/calendar.py b/homeassistant/components/habitica/calendar.py index be4433cb355..6de22a0314a 100644 --- a/homeassistant/components/habitica/calendar.py +++ b/homeassistant/components/habitica/calendar.py @@ -374,9 +374,6 @@ class HabiticaDailyRemindersCalendarEntity(HabiticaCalendarEntity): # Event ends before date range continue - if end_date and start > end_date: - # Event starts after date range - continue events.append( CalendarEvent( start=start, -- GitLab