renamed StateVar to StateVal, since it's a static value, not the current one

Author: craigbarratt

custom_components/pyscript/__init__.py

@@ -36,7 +36,7 @@
 from .global_ctx import GlobalContext, GlobalContextMgr
 from .jupyter_kernel import Kernel
 from .requirements import install_requirements
-from .state import State, StateVar
+from .state import State, StateVal
 from .trigger import TrigTime
 
 _LOGGER = logging.getLogger(LOGGER_PATH)
@@ -189,13 +189,13 @@ def state_var_remove():
     async def state_changed(event):
         var_name = event.data["entity_id"]
         if event.data.get("new_state", None):
-            new_val = StateVar(event.data["new_state"])
+            new_val = StateVal(event.data["new_state"])
         else:
             # state variable has been deleted
             new_val = None
 
         if event.data.get("old_state", None):
-            old_val = StateVar(event.data["old_state"])
+            old_val = StateVal(event.data["old_state"])
         else:
             # no previous state
             old_val = None

custom_components/pyscript/state.py

@@ -15,7 +15,7 @@
 STATE_VIRTUAL_ATTRS = {"last_changed", "last_updated"}
 
 
-class StateVar(str):
+class StateVal(str):
     """Class for representing the value and attributes of a state variable."""
 
     def __new__(cls, state):
@@ -152,10 +152,10 @@ async def set(cls, var_name, value=None, new_attributes=None, **kwargs):
         if var_name.count(".") != 1:
             raise NameError(f"invalid name {var_name} (should be 'domain.entity')")
 
-        if isinstance(value, StateVar):
+        if isinstance(value, StateVal):
             if new_attributes is None:
                 #
-                # value is a StateVar, so extract the attributes and value
+                # value is a StateVal, so extract the attributes and value
                 #
                 new_attributes = value.__dict__.copy()
                 for discard in STATE_VIRTUAL_ATTRS:
@@ -193,7 +193,7 @@ async def set(cls, var_name, value=None, new_attributes=None, **kwargs):
             # immediately update a variable we are monitoring since it could take a while
             # for the state changed event to propagate
             #
-            cls.notify_var_last[var_name] = StateVar(cls.hass.states.get(var_name))
+            cls.notify_var_last[var_name] = StateVal(cls.hass.states.get(var_name))
 
     @classmethod
     async def setattr(cls, var_attr_name, value):
@@ -259,7 +259,7 @@ async def get(cls, var_name):
         #
         # simplest case is just the state value
         #
-        state = StateVar(state)
+        state = StateVal(state)
         if len(parts) == 2:
             return state
         #

tests/test_decorator_errors.py

@@ -194,7 +194,7 @@ def func_wrapup():
         """Exception in <file.hello.func6 @state_active()> line 1:
     1 / pyscript.var1
         ^
-TypeError: unsupported operand type(s) for /: 'int' and 'StateVar'"""
+TypeError: unsupported operand type(s) for /: 'int' and 'StateVal'"""
         in caplog.text
     )