State.{set,get,setattr,getattr} don't need to be async

Author: craigbarratt

custom_components/pyscript/eval.py

@@ -1214,10 +1214,10 @@ async def recurse_assign(self, lhs, val):
                 raise NotImplementedError(f"unknown lhs type {lhs} (got {var_name}) in assign")
             dot_count = var_name.count(".")
             if dot_count == 1:
-                await State.set(var_name, val)
+                State.set(var_name, val)
                 return
             if dot_count == 2:
-                await State.setattr(var_name, val)
+                State.setattr(var_name, val)
                 return
             if dot_count > 0:
                 raise NameError(

custom_components/pyscript/state.py

@@ -147,7 +147,7 @@ def notify_var_get(cls, var_names, new_vars):
         return notify_vars
 
     @classmethod
-    async def set(cls, var_name, value=None, new_attributes=None, **kwargs):
+    def set(cls, var_name, value=None, new_attributes=None, **kwargs):
         """Set a state variable and optional attributes in hass."""
         if var_name.count(".") != 1:
             raise NameError(f"invalid name {var_name} (should be 'domain.entity')")
@@ -196,14 +196,14 @@ async def set(cls, var_name, value=None, new_attributes=None, **kwargs):
             cls.notify_var_last[var_name] = StateVal(cls.hass.states.get(var_name))
 
     @classmethod
-    async def setattr(cls, var_attr_name, value):
+    def setattr(cls, var_attr_name, value):
         """Set a state variable's attribute in hass."""
         parts = var_attr_name.split(".")
         if len(parts) != 3:
             raise NameError(f"invalid name {var_attr_name} (should be 'domain.entity.attr')")
         if not cls.exist(f"{parts[0]}.{parts[1]}"):
             raise NameError(f"state {parts[0]}.{parts[1]} doesn't exist")
-        await cls.set(f"{parts[0]}.{parts[1]}", **{parts[2]: value})
+        cls.set(f"{parts[0]}.{parts[1]}", **{parts[2]: value})
 
     @classmethod
     async def register_persist(cls, var_name):
@@ -223,12 +223,12 @@ async def persist(cls, var_name, default_value=None, default_attributes=None):
         exists = cls.exist(var_name)
 
         if not exists and default_value is not None:
-            await cls.set(var_name, default_value, default_attributes)
+            cls.set(var_name, default_value, default_attributes)
         elif exists and default_attributes is not None:
             # Patch the attributes with new values if necessary
             current = cls.hass.states.get(var_name)
             new_attributes = {k: v for (k, v) in default_attributes.items() if k not in current.attributes}
-            await cls.set(var_name, current.state, **new_attributes)
+            cls.set(var_name, current.state, **new_attributes)
 
     @classmethod
     def exist(cls, var_name):
@@ -308,7 +308,7 @@ async def service_call(*args, **kwargs):
             )
 
     @classmethod
-    async def getattr(cls, var_name):
+    def getattr(cls, var_name):
         """Return a dict of attributes for a state variable."""
         if isinstance(var_name, StateVal):
             attrs = var_name.__dict__.copy()
@@ -323,10 +323,10 @@ async def getattr(cls, var_name):
         return value.attributes.copy()
 
     @classmethod
-    async def get_attr(cls, var_name):
+    def get_attr(cls, var_name):
         """Return a dict of attributes for a state variable - deprecated."""
         _LOGGER.warning("state.get_attr() is deprecated: use state.getattr() instead")
-        return await cls.getattr(var_name)
+        return cls.getattr(var_name)
 
     @classmethod
     def completions(cls, root):

docs/new_features.rst

@@ -24,3 +24,7 @@ Planned new features post 1.0.0 include:
 The new features since 1.0.0 in master include:
 
 - None so far
+
+Bug fixes since 1.0.0 in master include:
+
+- the deprecated function ``state.get_attr`` was missing an ``await``, which caused an exception; in 1.0.0 use ``state.getattr`` instead (#88).