Fix up item references & Exception refs

vertexproject · Dec 26, 2024 · 335ec71 · 335ec71
1 parent 2172afa
commit 335ec71
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/synapse/lib/ast.py b/synapse/lib/ast.py
@@ -1020,13 +1020,13 @@ async def run(self, runt, genr):
                             yield item
 
                     except s_stormctrl.StormBreak as e:
-                        if e.item is not None:
-                            yield e.item
+                        if (eitem := e.get('item')) is not None:
+                            yield eitem
                         break
 
                     except s_stormctrl.StormContinue as e:
-                        if e.item is not None:
-                            yield e.item
+                        if (eitem := e.get('item')) is not None:
+                            yield eitem
                         continue
 
                     finally:
@@ -1079,13 +1079,13 @@ async def run(self, runt, genr):
                             yield jtem
 
                     except s_stormctrl.StormBreak as e:
-                        if e.item is not None:
-                            yield e.item
+                        if (eitem := e.get('item')) is not None:
+                            yield eitem
                         break
 
                     except s_stormctrl.StormContinue as e:
-                        if e.item is not None:
-                            yield e.item
+                        if (eitem := e.get('item')) is not None:
+                            yield eitem
                         continue
 
                     finally:
@@ -1109,13 +1109,13 @@ async def run(self, runt, genr):
                         await asyncio.sleep(0)
 
                 except s_stormctrl.StormBreak as e:
-                    if e.item is not None:
-                        yield e.item
+                    if (eitem := e.get('item')) is not None:
+                        yield eitem
                     break
 
                 except s_stormctrl.StormContinue as e:
-                    if e.item is not None:
-                        yield e.item
+                    if (eitem := e.get('item')) is not None:
+                        yield eitem
                     continue
 
                 finally:
@@ -1133,13 +1133,13 @@ async def run(self, runt, genr):
                         await asyncio.sleep(0)
 
                 except s_stormctrl.StormBreak as e:
-                    if e.item is not None:
-                        yield e.item
+                    if (eitem := e.get('item')) is not None:
+                        yield eitem
                     break
 
                 except s_stormctrl.StormContinue as e:
-                    if e.item is not None:
-                        yield e.item
+                    if (eitem := e.get('item')) is not None:
+                        yield eitem
                     continue
 
                 finally:

diff --git a/synapse/lib/stormctrl.py b/synapse/lib/stormctrl.py
@@ -63,11 +63,11 @@ def update(self, items):
             self.errinfo[k] = v
         self._setExcMesg()
 
-class StormLoopCtrl(_SynErrMixin):
+class StormLoopCtrl(_SynErrMixin, Exception):
     # Control flow statements for WHILE and FOR loop control
     statement = ''
 
-class StormGenrCtrl(_SynErrMixin):
+class StormGenrCtrl(_SynErrMixin, Exception):
     # Control flow statements for GENERATOR control
     statement = ''