Hold a single variable for the runtime data in the entity

Author: tsvi

homeassistant/components/jewish_calendar/entity.py

@@ -43,18 +43,14 @@ def __init__(
             entry_type=DeviceEntryType.SERVICE,
             identifiers={(DOMAIN, config_entry.entry_id)},
         )
-        data = config_entry.runtime_data
-        self._location = data.location
-        self._candle_lighting_offset = data.candle_lighting_offset
-        self._havdalah_offset = data.havdalah_offset
-        self._diaspora = data.diaspora
-        set_language(data.language)
+        self.data = config_entry.runtime_data
+        set_language(self.data.language)
 
     def make_zmanim(self, date: dt.date) -> Zmanim:
         """Create a Zmanim object."""
         return Zmanim(
             date=date,
-            location=self._location,
-            candle_lighting_offset=self._candle_lighting_offset,
-            havdalah_offset=self._havdalah_offset,
+            location=self.data.location,
+            candle_lighting_offset=self.data.candle_lighting_offset,
+            havdalah_offset=self.data.havdalah_offset,
         )

homeassistant/components/jewish_calendar/sensor.py

@@ -207,7 +207,7 @@ def __init__(
         if description.key == "weekly_portion":
             self._attr_options = list(Parasha)
         elif description.key == "holiday":
-            self._attr_options = HolidayDatabase(self._diaspora).get_all_names()
+            self._attr_options = HolidayDatabase(self.data.diaspora).get_all_names()
 
     async def async_added_to_hass(self) -> None:
         """Call when entity is added to hass."""
@@ -217,7 +217,7 @@ async def async_added_to_hass(self) -> None:
     async def async_update(self) -> None:
         """Update the state of the sensor."""
         now = dt_util.now()
-        _LOGGER.debug("Now: %s Location: %r", now, self._location)
+        _LOGGER.debug("Now: %s Location: %r", now, self.data.location)
 
         today = now.date()
         event_date = get_astral_event_date(self.hass, SUN_EVENT_SUNSET, today)
@@ -230,7 +230,7 @@ async def async_update(self) -> None:
 
         _LOGGER.debug("Now: %s Sunset: %s", now, sunset)
 
-        daytime_date = HDateInfo(today, diaspora=self._diaspora)
+        daytime_date = HDateInfo(today, diaspora=self.data.diaspora)
 
         # The Jewish day starts after darkness (called "tzais") and finishes at
         # sunset ("shkia"). The time in between is a gray area