merge 3.2

benjaminp · benjaminp · commit 518cf94ad795 · 2012-03-12T11:16:03.000-07:00
diff --git a/Python/ast.c b/Python/ast.c
@@ -1174,12 +1174,6 @@ ast_for_arg(struct compiling *c, const node *n)
     }
 
     return arg(name, annotation, c->c_arena);
-#if 0
-    result = Tuple(args, Store, LINENO(n), n->n_col_offset, c->c_arena);
-    if (!set_context(c, result, Store, n))
-        return NULL;
-    return result;
-#endif
 }
 
 /* returns -1 if failed to handle keyword only arguments

Original file line number	Diff line number	Diff line change
`@@ -1174,12 +1174,6 @@ ast_for_arg(struct compiling c, const node n)`
`1174`	`1174`	`}`
`1175`	`1175`
`1176`	`1176`	`return arg(name, annotation, c->c_arena);`
`1177`		`-#if 0`
`1178`		`- result = Tuple(args, Store, LINENO(n), n->n_col_offset, c->c_arena);`
`1179`		`- if (!set_context(c, result, Store, n))`
`1180`		`- return NULL;`
`1181`		`- return result;`
`1182`		`-#endif`
`1183`	`1177`	`}`
`1184`	`1178`
`1185`	`1179`	`/* returns -1 if failed to handle keyword only arguments`