simplify context retrieval code

Author: dlashua

custom_components/pyscript/function.py

@@ -125,10 +125,8 @@ async def event_fire(cls, event_type, **kwargs):
         if "context" in kwargs and isinstance(kwargs["context"], Context):
             context = kwargs["context"]
             del kwargs["context"]
-        elif curr_task in cls.task2context:
-            context = cls.task2context[curr_task]
         else:
-            context = Context()
+            context = cls.task2context.get(curr_task, None)
 
         cls.hass.bus.async_fire(event_type, kwargs, context=context)
 
@@ -195,10 +193,8 @@ async def service_call(cls, domain, name, **kwargs):
         if "context" in kwargs and isinstance(kwargs["context"], Context):
             context = kwargs["context"]
             del kwargs["context"]
-        elif curr_task in cls.task2context:
-            context = cls.task2context[curr_task]
         else:
-            context = Context()
+            context = cls.task2context.get(curr_task, None)
 
         await cls.hass.services.async_call(domain, name, kwargs, context=context)
 
@@ -261,10 +257,8 @@ async def service_call(*args, **kwargs):
             if "context" in kwargs and isinstance(kwargs["context"], Context):
                 context = kwargs["context"]
                 del kwargs["context"]
-            elif curr_task in cls.task2context:
-                context = cls.task2context[curr_task]
             else:
-                context = Context()
+                context = cls.task2context.get(curr_task, None)
 
             await cls.hass.services.async_call(domain, service, kwargs, context=context)
 

custom_components/pyscript/state.py

@@ -122,10 +122,8 @@ async def set(cls, var_name, value, new_attributes=None, **kwargs):
         if "context" in kwargs and isinstance(kwargs["context"], Context):
             context = kwargs["context"]
             del kwargs["context"]
-        elif curr_task in Function.task2context:
-            context = Function.task2context[curr_task]
         else:
-            context = Context()
+            context = Function.task2context.get(curr_task, None)
 
         if kwargs:
             new_attributes = new_attributes.copy()

custom_components/pyscript/trigger.py

@@ -831,7 +831,7 @@ async def trigger_watch(self):
                 if "context" in func_args and isinstance(func_args["context"], Context):
                     hass_context = Context(parent_id=func_args["context"].id)
                 else:
-                    hass_context = Context()
+                    hass_context = None
 
                 # Fire an event indicating that pyscript is running
                 # Note: the event must have an entity_id for logbook to work correctly.
@@ -851,7 +851,7 @@ async def trigger_watch(self):
                 async def do_func_call(func, ast_ctx, task_unique, task_unique_func, hass_context, **kwargs):
                     # Store HASS Context for this Task
                     Function.store_hass_context(hass_context)
-                    
+
                     if task_unique and task_unique_func:
                         await task_unique_func(task_unique)
                     await func.call(ast_ctx, **kwargs)