diff options
| -rw-r--r-- | Lib/test/test_py3kwarn.py | 12 | ||||
| -rw-r--r-- | Lib/test/test_syntax.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | Python/ast.c | 17 |
4 files changed, 37 insertions, 2 deletions
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py index 6d8863ad7b..55b327eaa9 100644 --- a/Lib/test/test_py3kwarn.py +++ b/Lib/test/test_py3kwarn.py @@ -31,6 +31,18 @@ class TestPy3KWarnings(unittest.TestCase): exec "`2`" in {} self.assertWarning(None, w, expected) + def test_paren_arg_names(self): + expected = 'parenthesized argument names are invalid in 3.x' + def check(s): + exec s in {} + self.assertWarning(None, w, expected) + with check_warnings() as w: + check("def f((x)): pass") + check("def f((((x))), (y)): pass") + check("def f((x), (((y))), m=32): pass") + # Something like def f((a, (b))): pass will raise the tuple + # unpacking warning. + def test_bool_assign(self): # So we don't screw up our globals def safe_exec(expr): diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py index e978a6ec7a..366c1e80b2 100644 --- a/Lib/test/test_syntax.py +++ b/Lib/test/test_syntax.py @@ -447,10 +447,14 @@ class SyntaxTestCase(unittest.TestCase): self.fail("SyntaxError is not a %s" % subclass.__name__) mo = re.search(errtext, str(err)) if mo is None: - self.fail("SyntaxError did not contain '%r'" % (errtext,)) + self.fail("%s did not contain '%r'" % (err, errtext,)) else: self.fail("compile() did not raise SyntaxError") + def test_paren_arg_with_default(self): + self._check_error("def f((x)=23): pass", + "parenthesized arg with default") + def test_assign_call(self): self._check_error("f() = 1", "assign") @@ -12,6 +12,10 @@ What's New in Python 2.6.5 Core and Builtins ----------------- +- Add Py3k warnings for parameter names in parenthesis. + +- Issue #7362: Give a propery error message for def f((x)=3): pass. + - Issue #7085: Fix crash when importing some extensions in a thread on MacOSX 10.6. diff --git a/Python/ast.c b/Python/ast.c index b89e29c55c..574a3d817c 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -682,7 +682,8 @@ ast_for_arguments(struct compiling *c, const node *n) while (i < NCH(n)) { ch = CHILD(n, i); switch (TYPE(ch)) { - case fpdef: + case fpdef: { + int complex_args = 0, parenthesized = 0; handle_fpdef: /* XXX Need to worry about checking if TYPE(CHILD(n, i+1)) is anything other than EQUAL or a comma? */ @@ -697,6 +698,12 @@ ast_for_arguments(struct compiling *c, const node *n) found_default = 1; } else if (found_default) { + /* def f((x)=4): pass should raise an error. + def f((x, (y))): pass will just incur the tuple unpacking warning. */ + if (parenthesized && !complex_args) { + ast_error(n, "parenthesized arg with default"); + goto error; + } ast_error(n, "non-default argument follows default argument"); goto error; @@ -709,6 +716,7 @@ ast_for_arguments(struct compiling *c, const node *n) if (Py_Py3kWarningFlag && !ast_warn(c, ch, "tuple parameter unpacking has been removed in 3.x")) goto error; + complex_args = 1; asdl_seq_SET(args, k++, compiler_complex_args(c, ch)); if (!asdl_seq_GET(args, k-1)) goto error; @@ -716,6 +724,7 @@ ast_for_arguments(struct compiling *c, const node *n) /* def foo((x)): setup for checking NAME below. */ /* Loop because there can be many parens and tuple unpacking mixed in. */ + parenthesized = 1; ch = CHILD(ch, 0); assert(TYPE(ch) == fpdef); goto handle_fpdef; @@ -737,7 +746,13 @@ ast_for_arguments(struct compiling *c, const node *n) } i += 2; /* the name and the comma */ + if (parenthesized && Py_Py3kWarningFlag && + !ast_warn(c, ch, "parenthesized argument names " + "are invalid in 3.x")) + goto error; + break; + } case STAR: if (!forbidden_check(c, CHILD(n, i+1), STR(CHILD(n, i+1)))) goto error; |