From 73c958aced6d94fb325e7521039c2f95d994f7fe Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Thu, 7 Jun 2007 13:23:28 +0000 Subject: [PATCH] Disallow function calls like foo(None=1). Backport from py3k rev. 55708 by Guido. (backport from rev. 55802) --- Lib/test/test_compile.py | 3 +++ Python/ast.c | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py index a3f15bf6510..1a98d2ff9d4 100644 --- a/Lib/test/test_compile.py +++ b/Lib/test/test_compile.py @@ -37,6 +37,9 @@ class TestSpecifics(unittest.TestCase): 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)", "", "exec") + def test_duplicate_global_local(self): try: exec 'def f(a): global a; a = 1' diff --git a/Python/ast.c b/Python/ast.c index 67f45ed0680..2a27b646984 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -1855,13 +1855,18 @@ ast_for_call(struct compiling *c, const node *n, expr_ty func) * 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;