directly access hass.data[DATA_RESTORE_STATE] to avoid deprecated api

see #473.  This is a hack; should re-implement using RestoreEntity.

Author: craigbarratt

custom_components/pyscript/__init__.py

@@ -25,7 +25,7 @@
 from homeassistant.exceptions import HomeAssistantError
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import Event as HAEvent
-from homeassistant.helpers.restore_state import RestoreStateData
+from homeassistant.helpers.restore_state import DATA_RESTORE_STATE
 from homeassistant.loader import bind_hass
 
 from .const import (
@@ -80,7 +80,8 @@ async def async_setup(hass: HomeAssistant, config: Config) -> bool:
 
 async def restore_state(hass: HomeAssistant) -> None:
     """Restores the persisted pyscript state."""
-    restore_data = await RestoreStateData.async_get_instance(hass)
+    # this is a hack accessing hass internals; should re-implement using RestoreEntity
+    restore_data = hass.data[DATA_RESTORE_STATE]
     for entity_id, value in restore_data.last_states.items():
         if entity_id.startswith("pyscript."):
             last_state = value.state

custom_components/pyscript/state.py

@@ -4,7 +4,7 @@
 import logging
 
 from homeassistant.core import Context
-from homeassistant.helpers.restore_state import RestoreStateData
+from homeassistant.helpers.restore_state import DATA_RESTORE_STATE
 from homeassistant.helpers.service import async_get_all_descriptions
 
 from .const import LOGGER_PATH
@@ -217,7 +217,8 @@ def setattr(cls, var_attr_name, value):
     async def register_persist(cls, var_name):
         """Register pyscript state variable to be persisted with RestoreState."""
         if var_name.startswith("pyscript.") and var_name not in cls.persisted_vars:
-            restore_data = await RestoreStateData.async_get_instance(cls.hass)
+            # this is a hack accessing hass internals; should re-implement using RestoreEntity
+            restore_data = cls.hass.data[DATA_RESTORE_STATE]
             this_entity = PyscriptEntity()
             this_entity.entity_id = var_name
             cls.persisted_vars[var_name] = this_entity