Simplify logic for handling import *

nnorwitz · nnorwitz · commit 28b32ac6bc23 · 2005-12-06T07:41:30.000Z
diff --git a/Python/compile.c b/Python/compile.c
@@ -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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2440,7 +2440,6 @@ static int`
`2440`	`2440`	`compiler_from_import(struct compiler *c, stmt_ty s)`
`2441`	`2441`	`{`
`2442`	`2442`	`int i, n = asdl_seq_LEN(s->v.ImportFrom.names);`
`2443`		`- int star = 0;`
`2444`	`2443`
`2445`	`2444`	`PyObject *names = PyTuple_New(n);`
`2446`	`2445`	`if (!names)`
`@@ -2474,8 +2473,7 @@ compiler_from_import(struct compiler *c, stmt_ty s)`
`2474`	`2473`	`if (i == 0 && PyString_AS_STRING(alias->name) == '') {`
`2475`	`2474`	`assert(n == 1);`
`2476`	`2475`	`ADDOP(c, IMPORT_STAR);`
`2477`		`- star = 1;`
`2478`		`- break;`
	`2476`	`+ return 1;`
`2479`	`2477`	`}`
`2480`	`2478`
`2481`	`2479`	`ADDOP_NAME(c, IMPORT_FROM, alias->name, names);`
`@@ -2488,9 +2486,8 @@ compiler_from_import(struct compiler *c, stmt_ty s)`
`2488`	`2486`	`return 0;`
`2489`	`2487`	`}`
`2490`	`2488`	`}`
`2491`		`- if (!star)`
`2492`		`- /* remove imported module */`
`2493`		`- ADDOP(c, POP_TOP);`
	`2489`	`+ /* remove imported module */`
	`2490`	`+ ADDOP(c, POP_TOP);`
`2494`	`2491`	`return 1;`
`2495`	`2492`	`}`
`2496`	`2493`