Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Simplify logic for handling import *

This commit is contained in:
Neal Norwitz 2005-12-06 07:41:30 +00:00
parent b15ec09343
commit 28b32ac6bc
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Python/compile.c
View File

@ -2440,7 +2440,6 @@ static int
compiler_from_import(struct compiler *c, stmt_ty s)
{
int i, n = asdl_seq_LEN(s->v.ImportFrom.names);
int star = 0;
PyObject *names = PyTuple_New(n);
if (!names)
@ -2474,8 +2473,7 @@ compiler_from_import(struct compiler *c, stmt_ty s)
if (i == 0 && *PyString_AS_STRING(alias->name) == '*') {
assert(n == 1);
ADDOP(c, IMPORT_STAR);
star = 1;
break;
return 1;
}
ADDOP_NAME(c, IMPORT_FROM, alias->name, names);
@ -2488,9 +2486,8 @@ compiler_from_import(struct compiler *c, stmt_ty s)
return 0;
}
}
if (!star)
/* remove imported module */
ADDOP(c, POP_TOP);
/* remove imported module */
ADDOP(c, POP_TOP);
return 1;
}