traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again.

This commit is contained in:
Neal Norwitz 2006-07-12 05:26:17 +00:00
parent 3b9be2ae6f
commit edef2be4af
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/test/test_grammar.py
View File

@ -531,6 +531,11 @@ n = 0
for x in Squares(10): n = n+x for x in Squares(10): n = n+x
if n != 285: raise TestFailed, 'for over growing sequence' if n != 285: raise TestFailed, 'for over growing sequence'
result = []
for x, in [(1,), (2,), (3,)]:
result.append(x)
vereq(result, [1, 2, 3])
print 'try_stmt' print 'try_stmt'
### try_stmt: 'try' ':' suite (except_clause ':' suite)+ ['else' ':' suite] ### try_stmt: 'try' ':' suite (except_clause ':' suite)+ ['else' ':' suite]
### | 'try' ':' suite 'finally' ':' suite ### | 'try' ':' suite 'finally' ':' suite

2
Misc/NEWS
View File

@ -12,6 +12,8 @@ What's New in Python 2.5 beta 2?
Core and builtins Core and builtins
----------------- -----------------
- Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again.
- Bug #1441486: The literal representation of -(sys.maxint - 1) - Bug #1441486: The literal representation of -(sys.maxint - 1)
again evaluates to a int object, not a long. again evaluates to a int object, not a long.

8
Python/ast.c
View File

@ -2666,6 +2666,7 @@ ast_for_for_stmt(struct compiling *c, const node *n)
asdl_seq *_target, *seq = NULL, *suite_seq; asdl_seq *_target, *seq = NULL, *suite_seq;
expr_ty expression; expr_ty expression;
expr_ty target; expr_ty target;
const node *node_target;
/* for_stmt: 'for' exprlist 'in' testlist ':' suite ['else' ':' suite] */ /* for_stmt: 'for' exprlist 'in' testlist ':' suite ['else' ':' suite] */
REQ(n, for_stmt); REQ(n, for_stmt);
@ -2675,10 +2676,13 @@ ast_for_for_stmt(struct compiling *c, const node *n)
return NULL; return NULL;
} }
_target = ast_for_exprlist(c, CHILD(n, 1), Store); node_target = CHILD(n, 1);
_target = ast_for_exprlist(c, node_target, Store);
if (!_target) if (!_target)
return NULL; return NULL;
if (asdl_seq_LEN(_target) == 1) /* Check the # of children rather than the length of _target, since
for x, in ... has 1 element in _target, but still requires a Tuple. */
if (NCH(node_target) == 1)
target = (expr_ty)asdl_seq_GET(_target, 0); target = (expr_ty)asdl_seq_GET(_target, 0);
else else
target = Tuple(_target, Store, LINENO(n), n->n_col_offset, c->c_arena); target = Tuple(_target, Store, LINENO(n), n->n_col_offset, c->c_arena);

1
Python/import.c
View File

@ -60,6 +60,7 @@ extern time_t PyOS_GetLastModificationTime(char *, FILE *);
Python 2.5a0: 62081 (ast-branch) Python 2.5a0: 62081 (ast-branch)
Python 2.5a0: 62091 (with) Python 2.5a0: 62091 (with)
Python 2.5a0: 62092 (changed WITH_CLEANUP opcode) Python 2.5a0: 62092 (changed WITH_CLEANUP opcode)
Python 2.5c1: 62101 (fix wrong code: for x, in ...)
. .
*/ */
#define MAGIC (62092 | ((long)'\r'<<16) | ((long)'\n'<<24)) #define MAGIC (62092 | ((long)'\r'<<16) | ((long)'\n'<<24))