From 28b32ac6bc23b8bc2b7bb37bdd199cf550ab7737 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Tue, 6 Dec 2005 07:41:30 +0000
Subject: Simplify logic for handling import *

---
 Python/compile.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Python/compile.c b/Python/compile.c
index 418194e..4ad17b3 100644
--- 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;
 }
 
-- 
cgit v0.12

