Re-allow 'import mod.submod as s', and change its meaning to what it should

mean; the same as 'from mod import submod as s'.

diff --git a/Python/compile.c b/Python/compile.c
index e8462c653961384ee825b2ed375f9fb4f6e5543a..dc6e2fb5feee05276e6bddc2253ee291a8a512ff 100644 (file)
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -2354,12 +2354,15 @@ com_import_stmt(struct compiling *c, node *n)
                        com_addopname(c, IMPORT_NAME, CHILD(subn, 0));
                        com_push(c, 1);
                        if (NCH(subn) > 1) {
-                               if (strcmp(STR(CHILD(subn, 1)), "as") != 0 ||
-                                   NCH(CHILD(subn, 0)) > 1) {
+                               int j;
+                               if (strcmp(STR(CHILD(subn, 1)), "as") != 0) {
                                        com_error(c, PyExc_SyntaxError,
                                                  "invalid syntax");
                                        return;
                                }
+                               for (j=2 ; j < NCH(CHILD(subn, 0)); j += 2)
+                                       com_addopname(c, LOAD_ATTR,
+                                                     CHILD(CHILD(subn, 0), j));
                                com_addopname(c, STORE_NAME, CHILD(subn, 2));
                        } else
                                com_addopname(c, STORE_NAME,