[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

Tue Jun 21 05:05:35 CEST 2011

http://hg.python.org/cpython/rev/c8192197d23d
changeset: 70920:c8192197d23d
parent: 70918:c624fd54263c
parent: 70919:275862274567
user: Benjamin Peterson <benjamin at python.org>
date: Mon Jun 20 22:09:20 2011 -0500
summary:
 merge 3.2
files:
 Python/symtable.c | 12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Python/symtable.c b/Python/symtable.c
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -1576,12 +1576,12 @@
 }
 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);
-- 
Repository URL: http://hg.python.org/cpython
