summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-03-12 18:02:10 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-03-12 18:02:10 (GMT)
commitbebcd18b75b019406019a771a54e96fd1bca54cb (patch)
treedd6e6bd36a98d62fe1e49df6e48a75b6de9e930a
parent7e0dbfbbdea946e620804641755686475652c9d0 (diff)
parentbc4665ebcb260e937bb50d92270bfcf1d62266dd (diff)
downloadcpython-bebcd18b75b019406019a771a54e96fd1bca54cb.zip
cpython-bebcd18b75b019406019a771a54e96fd1bca54cb.tar.gz
cpython-bebcd18b75b019406019a771a54e96fd1bca54cb.tar.bz2
merge 3.2
-rw-r--r--Python/ast.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/ast.c b/Python/ast.c
index 0f93098..fc42823 100644
--- 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);