From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Mon, 6 Aug 2001 20:34:25 +0000 (+0000)
Subject: Another bug fix for recent import * warning (caught by Thomas Wouters)
X-Git-Tag: v2.2a3~789
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a53bd858216f24688a7cd9a7e6482b7f223a288;p=python

Another bug fix for recent import * warning (caught by Thomas Wouters)

Only return if symtable_warn() returns -1, indicating that the warning
was turned into an error.
---

diff --git a/Python/compile.c b/Python/compile.c
index a30d663219..31a75bd3b1 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -5295,9 +5295,9 @@ symtable_import(struct symtable *st, node *n)
 		}
 		if (TYPE(CHILD(n, 3)) == STAR) {
 			if (st->st_cur->ste_type != TYPE_MODULE) {
-				symtable_warn(st,
-				      "import * only allowed at module level");
-				return;
+				if (symtable_warn(st,
+				  "import * only allowed at module level") < 0)
+					return;
 			}
 			st->st_cur->ste_optimized |= OPT_IMPORT_STAR;
 			st->st_cur->ste_opt_lineno = n->n_lineno;