summaryrefslogtreecommitdiff
path: root/Python/symtable.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-06-20 22:09:20 -0500
committerBenjamin Peterson <benjamin@python.org>2011-06-20 22:09:20 -0500
commit03b06df5ee44962837d435123997a3fb02abfe84 (patch)
tree9badd2d4074a995db8a064e18ea79a6d1a903941 /Python/symtable.c
parent53916680d86f8b476f935b6b4780d107c1079354 (diff)
parentcf1391cc1af779295a0547ab74e4c6925596c3b1 (diff)
downloadcpython-03b06df5ee44962837d435123997a3fb02abfe84.tar.gz
merge 3.2
Diffstat (limited to 'Python/symtable.c')
-rw-r--r--Python/symtable.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/Python/symtable.c b/Python/symtable.c
index b82d8d5b31..232f02c500 100644
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -1576,12 +1576,12 @@ symtable_visit_alias(struct symtable *st, alias_ty a)
}
else {
if (st->st_cur->ste_type != ModuleBlock) {
- int lineno = st->st_cur->ste_lineno;
- int col_offset = st->st_cur->ste_col_offset;
- PyErr_SetString(PyExc_SyntaxError, IMPORT_STAR_WARNING);
- PyErr_SyntaxLocationEx(st->st_filename, lineno, col_offset);
- Py_DECREF(store_name);
- return 0;
+ int lineno = st->st_cur->ste_lineno;
+ int col_offset = st->st_cur->ste_col_offset;
+ PyErr_SetString(PyExc_SyntaxError, IMPORT_STAR_WARNING);
+ PyErr_SyntaxLocationEx(st->st_filename, lineno, col_offset);
+ Py_DECREF(store_name);
+ return 0;
}
st->st_cur->ste_unoptimized |= OPT_IMPORT_STAR;
Py_DECREF(store_name);