merge 3.2

This commit is contained in:
Benjamin Peterson 2012-03-12 11:02:10 -07:00
commit bebcd18b75

View file

@ -1153,7 +1153,7 @@ seq_for_testlist(struct compiling *c, const node *n)
} }
static arg_ty static arg_ty
compiler_arg(struct compiling *c, const node *n) ast_for_arg(struct compiling *c, const node *n)
{ {
identifier name; identifier name;
expr_ty annotation = NULL; expr_ty annotation = NULL;
@ -1367,7 +1367,7 @@ ast_for_arguments(struct compiling *c, const node *n)
"non-default argument follows default argument"); "non-default argument follows default argument");
return NULL; return NULL;
} }
arg = compiler_arg(c, ch); arg = ast_for_arg(c, ch);
if (!arg) if (!arg)
return NULL; return NULL;
asdl_seq_SET(posargs, k++, arg); asdl_seq_SET(posargs, k++, arg);