Commit 70c1c120 authored by Thomas Wouters's avatar Thomas Wouters

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'.
parent 08504825
...@@ -2354,12 +2354,15 @@ com_import_stmt(struct compiling *c, node *n) ...@@ -2354,12 +2354,15 @@ com_import_stmt(struct compiling *c, node *n)
com_addopname(c, IMPORT_NAME, CHILD(subn, 0)); com_addopname(c, IMPORT_NAME, CHILD(subn, 0));
com_push(c, 1); com_push(c, 1);
if (NCH(subn) > 1) { if (NCH(subn) > 1) {
if (strcmp(STR(CHILD(subn, 1)), "as") != 0 || int j;
NCH(CHILD(subn, 0)) > 1) { if (strcmp(STR(CHILD(subn, 1)), "as") != 0) {
com_error(c, PyExc_SyntaxError, com_error(c, PyExc_SyntaxError,
"invalid syntax"); "invalid syntax");
return; 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)); com_addopname(c, STORE_NAME, CHILD(subn, 2));
} else } else
com_addopname(c, STORE_NAME, com_addopname(c, STORE_NAME,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment