support "from module import *"

Author: craigbarratt

custom_components/pyscript/eval.py

@@ -412,9 +412,14 @@ async def ast_importfrom(self, arg):
         else:
             mod = sys.modules[arg.module]
         for imp in arg.names:
-            self.sym_table[imp.name if imp.asname is None else imp.asname] = getattr(
-                mod, imp.name
-            )
+            if imp.name == "*":
+                for name, value in mod.__dict__.items():
+                    if name[0] != "_":
+                        self.sym_table[name] = value
+            else:
+                self.sym_table[
+                    imp.name if imp.asname is None else imp.asname
+                ] = getattr(mod, imp.name)
 
     async def ast_if(self, arg):
         """Execute if statement."""
@@ -604,7 +609,7 @@ async def recurse_assign(self, lhs, val):
             try:
                 val_iter = val.__iter__()
             except AttributeError:
-                 raise TypeError("cannot unpack non-iterable object")
+                raise TypeError("cannot unpack non-iterable object")
             sentinel = object()
             for lhs_elt in lhs.elts:
                 val_elt = next(val_iter, sentinel)
@@ -614,7 +619,7 @@ async def recurse_assign(self, lhs, val):
                     )
                 await self.recurse_assign(lhs_elt, val_elt)
             if next(val_iter, sentinel) is not sentinel:
-                 raise TypeError(f"too many values to unpack (expected {len(lhs.elts)})")
+                raise TypeError(f"too many values to unpack (expected {len(lhs.elts)})")
         elif isinstance(lhs, ast.Subscript):
             var = await self.aeval(lhs.value)
             if isinstance(lhs.slice, ast.Index):

tests/custom_components/pyscript/test_unit_eval.py

@@ -185,6 +185,14 @@
     ["import random as rand, math as m\n[rand.uniform(10,10), m.sqrt(1024)]", [10, 32]],
     ["import cmath\ncmath.sqrt(complex(3, 4))", 2 + 1j],
     ["from math import sqrt as sqroot\nsqroot(1024)", 32],
+    ["from math import sin, cos, sqrt\nsqrt(1024)", 32],
+    ["from math import *\nsqrt(1024)", 32],
+    ["from math import sin, floor, sqrt; [sqrt(9), floor(10.5)]", [3, 10]],
+    ["from math import *; [sqrt(9), floor(10.5)]", [3, 10]],
+    [
+        "from math import floor as floor_alt, sqrt as sqrt_alt; [sqrt_alt(9), floor_alt(10.5)]",
+        [3, 10],
+    ],
     ["[i for i in range(7) if i != 5 if i != 3]", [0, 1, 2, 4, 6]],
     [
         """