fixed another case for #469. Hopefully it's finally correct...

Author: craigbarratt

custom_components/pyscript/eval.py

@@ -1698,16 +1698,16 @@ async def ast_boolop(self, arg):
         if isinstance(arg.op, ast.And):
             val = True
             for arg1 in arg.values:
-                this_val = await self.aeval(arg1)
-                if not this_val:
-                    return this_val
-                val = this_val
+                val = await self.aeval(arg1)
+                if not val:
+                    return val
             return val
+        val = False
         for arg1 in arg.values:
             val = await self.aeval(arg1)
             if val:
                 return val
-        return False
+        return val
 
     async def eval_elt_list(self, elts):
         """Evaluate and star list elements."""

tests/test_unit_eval.py

@@ -56,6 +56,7 @@
     ["False or True", True],
     ["False or False", False],
     ["isinstance(False or False, bool)", True],
+    ["isinstance(False or 0, int)", True],
     ["f'{1} {2:02d} {3:.1f}'", "1 02 3.0"],
     [["x = None", "x is None"], True],
     ["None is not None", False],