Fix SF bug #116263: support for from .. import *

transformer.py: return '*', None from com_import_as_name
pycodegen.py: special case for name == '*'
pyassem.py: fix stack counting for IMPORT_ opcodes

1 files changed, 8 insertions, 3 deletions

diff --git a/Lib/compiler/pycodegen.py b/Lib/compiler/pycodegen.py
index 2a1b3081c6..288872975a 100644
--- a/Lib/compiler/pycodegen.py
+++ b/Lib/compiler/pycodegen.py
@@ -439,9 +439,14 @@ class CodeGenerator:
         for name, alias in node.names:
             if name == '*':
                 self.namespace = 0
-            self.emit('IMPORT_FROM', name)
-            self._resolveDots(name)
-            self.storeName(alias or name)
+                self.emit('IMPORT_STAR')
+                # There can only be one name w/ from ... import *
+                assert len(node.names) == 1
+                return
+            else:
+                self.emit('IMPORT_FROM', name)
+                self._resolveDots(name)
+                self.storeName(alias or name)
         self.emit('POP_TOP')
 
     def _resolveDots(self, name):