Merge pull request #302 from bruxy70/development

2021.12 compatibility update
bruxy70 · Dec 7, 2021 · bd509b8 · bd509b8
2 parents 091fee9 + 1f9ba30
commit bd509b8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/custom_components/garbage_collection/calendar.py b/custom_components/garbage_collection/calendar.py
@@ -53,7 +53,7 @@ async def async_get_events(self, hass, start_date, end_date):
         )
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         """Return the device state attributes."""
         if self.hass.data[DOMAIN][CALENDAR_PLATFORM].event is None:
             # No tasks, we don't need to show anything.

diff --git a/custom_components/garbage_collection/sensor.py b/custom_components/garbage_collection/sensor.py
@@ -229,7 +229,7 @@ async def async_load_holidays(self, today: date) -> None:
                 and type(self._holiday_observed) is bool
                 and not self._holiday_observed
             ):
-                kwargs["observed"] = False  # type: ignore
+                kwargs["observed"] = self._holiday_observed  # type: ignore
             hol = holidays.CountryHoliday(self._country_holidays, **kwargs)
             if self._holiday_pop_named is not None:
                 for pop in self._holiday_pop_named:
@@ -324,7 +324,7 @@ def icon(self):
         return self._icon
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         """Return the state attributes."""
         res = {}
         if self._next_date is None: