[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/e00f6b8b83e8
changeset:   75544:e00f6b8b83e8
parent:      75542:3877bf2e3235
parent:      75543:fe0b2681a42f
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Mar 12 11:02:10 2012 -0700
summary:
  merge 3.2

files:
  Python/ast.c |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Python/ast.c b/Python/ast.c
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -1153,7 +1153,7 @@
 }
 
 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 @@
                              "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);

-- 
Repository URL: http://hg.python.org/cpython