merge 3.2

benjaminp · benjaminp · commit bebcd18b75b0 · 2012-03-12T11:02:10.000-07:00
diff --git a/Python/ast.c b/Python/ast.c
@@ -1153,7 +1153,7 @@ seq_for_testlist(struct compiling *c, const node *n)
 }
 
 static arg_ty
-compiler_arg(struct compiling *c, const node *n)
+ast_for_arg(struct compiling *c, const node *n)
 {
     identifier name;
     expr_ty annotation = NULL;
@@ -1367,7 +1367,7 @@ ast_for_arguments(struct compiling *c, const node *n)
                              "non-default argument follows default argument");
                     return NULL;
                 }
-                arg = compiler_arg(c, ch);
+                arg = ast_for_arg(c, ch);
                 if (!arg)
                     return NULL;
                 asdl_seq_SET(posargs, k++, arg);

Original file line number	Diff line number	Diff line change
`@@ -1153,7 +1153,7 @@ seq_for_testlist(struct compiling c, const node n)`
`1153`	`1153`	`}`
`1154`	`1154`
`1155`	`1155`	`static arg_ty`
`1156`		`-compiler_arg(struct compiling c, const node n)`
	`1156`	`+ast_for_arg(struct compiling c, const node n)`
`1157`	`1157`	`{`
`1158`	`1158`	`identifier name;`
`1159`	`1159`	`expr_ty annotation = NULL;`
`@@ -1367,7 +1367,7 @@ ast_for_arguments(struct compiling c, const node n)`
`1367`	`1367`	`"non-default argument follows default argument");`
`1368`	`1368`	`return NULL;`
`1369`	`1369`	`}`
`1370`		`- arg = compiler_arg(c, ch);`
	`1370`	`+ arg = ast_for_arg(c, ch);`
`1371`	`1371`	`if (!arg)`
`1372`	`1372`	`return NULL;`
`1373`	`1373`	`asdl_seq_SET(posargs, k++, arg);`