Implemented from ... import *, issue #615

pyjs/src/pyjs/builtin/pyjslib.py

@@ -952,6 +952,16 @@ def __dynamic_load__(importName):
             __nondynamic_modules__[importName] = 1.0
     return module
 
+def __import_all__(path, context, namespace, module_name=None, get_base=True):
+    module = ___import___(path, context, module_name, get_base)
+    if JS("""typeof @{{module}}['__all__'] == 'undefined'"""):
+        for name in dir(module):
+            if not name.startswith('_'):
+                JS("""@{{namespace}}[@{{name}}] = @{{module}}[@{{name}}];""")
+    else:
+        for name in module.__all__:
+            JS("""@{{namespace}}[@{{name}}] = @{{module}}[@{{name}}];""")
+
 class BaseException:
 
     def __init__(self, *args):

pyjs/src/pyjs/translator.py

@@ -332,6 +332,7 @@
     "slice",
     "__delslice",
     "___import___",
+    "__import_all__",
     "_handle_exception",
     ))
 
@@ -1970,7 +1971,8 @@ def _import(self, node, current_klass, root_level = False):
         # object to check our scope
         self._doImport(node.names, current_klass, root_level, True)
 
-    def _doImport(self, names, current_klass, root_level, assignBase, absPath=False):
+    def _doImport(self, names, current_klass, root_level, assignBase,
+                  absPath=False, all=False):
         if root_level:
             modtype = 'root-module'
         else:
@@ -2013,12 +2015,20 @@ def _doImport(self, names, current_klass, root_level, assignBase, absPath=False)
                     context = 'null'
                 else:
                     context = self.import_context
-                import_stmt = "@{{___import___}}('%s', %s" % (
-                                    importName,
-                                    context,
-                                    )
+                if not all:
+                    import_stmt = "@{{___import___}}('%s', %s" % (
+                        importName,
+                        context,
+                    )
+                else:
+                    import_stmt = "@{{__import_all__}}('%s', %s, %s" %(
+                        importName,
+                        context,
+                        self.modpfx()[:-1],
+                    )                        
+
                 if not assignBase:
-                    self.w( self.spacing() + import_stmt + 'null, false);')
+                    self.w( self.spacing() + import_stmt + ', null, false);')
                 self._lhsFromName(importName, current_klass, modtype)
                 self.add_imported_module(importName)
             if assignBase:
@@ -2104,6 +2114,10 @@ def _from(self, node, current_klass, root_level = False):
                 if modname[0] == '.':
                     modname = modname[1:]
         for name in node.names:
+            if name[0] == "*":
+                self._doImport(((modname, name[0]),), current_klass,
+                               root_level, False, absPath, True)
+                continue
             sub = modname + '.' + name[0]
             ass_name = name[1] or name[0]
             self._doImport(((sub, ass_name),), current_klass, root_level, True, absPath)