[Python-checkins] r55803 - in python/branches/release25-maint: Lib/test/test_compile.py Python/ast.c

Thu Jun 7 15:23:29 CEST 2007

Author: georg.brandl
Date: Thu Jun 7 15:23:28 2007
New Revision: 55803
Modified:
 python/branches/release25-maint/Lib/test/test_compile.py
 python/branches/release25-maint/Python/ast.c
Log:
Disallow function calls like foo(None=1).
Backport from py3k rev. 55708 by Guido.
 (backport from rev. 55802)
Modified: python/branches/release25-maint/Lib/test/test_compile.py
==============================================================================

--- python/branches/release25-maint/Lib/test/test_compile.py	(original)
+++ python/branches/release25-maint/Lib/test/test_compile.py	Thu Jun 7 15:23:28 2007
@@ -37,6 +37,9 @@
 def test_syntax_error(self):
 self.assertRaises(SyntaxError, compile, "1+*3", "filename", "exec")
 
+ def test_none_keyword_arg(self):
+ self.assertRaises(SyntaxError, compile, "f(None=1)", "<string>", "exec")
+
 def test_duplicate_global_local(self):
 try:
 exec 'def f(a): global a; a = 1'
Modified: python/branches/release25-maint/Python/ast.c
==============================================================================
--- python/branches/release25-maint/Python/ast.c	(original)
+++ python/branches/release25-maint/Python/ast.c	Thu Jun 7 15:23:28 2007
@@ -1855,13 +1855,18 @@
 * then is very confusing.
 */
 if (e->kind == Lambda_kind) {
- ast_error(CHILD(ch, 0), "lambda cannot contain assignment");
- return NULL;
+ ast_error(CHILD(ch, 0),
+ "lambda cannot contain assignment");
+ return NULL;
 } else if (e->kind != Name_kind) {
- ast_error(CHILD(ch, 0), "keyword can't be an expression");
- return NULL;
+ ast_error(CHILD(ch, 0), "keyword can't be an expression");
+ return NULL;
 }
 		key = e->v.Name.id;
+ if (!strcmp(PyString_AS_STRING(key), "None")) {
+ ast_error(CHILD(ch, 0), "assignment to None");
+ return NULL;
+ }
 		e = ast_for_expr(c, CHILD(ch, 2));
 if (!e)
 return NULL;
