diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-06-21 03:09:20 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-06-21 03:09:20 (GMT) |
| commit | 28db0fd3575ebe5f155d4e04fcfaebc33957ae28 (patch) | |
| tree | 120498bd6b5e5c4423cbf1c7d0f0fab558f2eff1 /Python/symtable.c | |
| parent | 267ca6cb231501d3d89fa835adb799284835ee2a (diff) | |
| parent | b7149cad045b0273e2cb104a1f15ff942eab1cf6 (diff) | |
| download | cpython-28db0fd3575ebe5f155d4e04fcfaebc33957ae28.zip cpython-28db0fd3575ebe5f155d4e04fcfaebc33957ae28.tar.gz cpython-28db0fd3575ebe5f155d4e04fcfaebc33957ae28.tar.bz2 | |
merge 3.2
Diffstat (limited to 'Python/symtable.c')
| -rw-r--r-- | Python/symtable.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Python/symtable.c b/Python/symtable.c index b82d8d5..232f02c 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); |