diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2006-03-27 08:58:23 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2006-03-27 08:58:23 (GMT) |
| commit | 33b730e33cb0a63f4030d1587a6196dcde36e965 (patch) | |
| tree | 1f20b2cdd510692f3904ddb85b0bf446994b4d66 /Python/ast.c | |
| parent | 6c403597954487e8129221351f72da3735c52c09 (diff) | |
| download | cpython-33b730e33cb0a63f4030d1587a6196dcde36e965.zip cpython-33b730e33cb0a63f4030d1587a6196dcde36e965.tar.gz cpython-33b730e33cb0a63f4030d1587a6196dcde36e965.tar.bz2 | |
Fix SF bug #1458903 with AST compiler.
def foo((x)): was getting recognized as requiring tuple unpacking
which is not correct.
Add tests for this case and the proper way to unpack a tuple of one:
def foo((x,)):
test_inpsect was incorrect before. I'm not sure why it was passing,
but that has been corrected with a test for both functions above.
This means the test (and therefore inspect.getargspec()) are broken in 2.4.
Diffstat (limited to 'Python/ast.c')
| -rw-r--r-- | Python/ast.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Python/ast.c b/Python/ast.c index 30275a6..86f3d3c 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -645,10 +645,17 @@ ast_for_arguments(struct compiling *c, const node *n) goto error; } if (NCH(ch) == 3) { - asdl_seq_SET(args, k++, - compiler_complex_args(c, CHILD(ch, 1))); - } - else if (TYPE(CHILD(ch, 0)) == NAME) { + ch = CHILD(ch, 1); + /* def foo((x)): is not complex, special case. */ + if (NCH(ch) != 1) { + /* We have complex arguments, setup for unpacking. */ + asdl_seq_SET(args, k++, compiler_complex_args(c, ch)); + } else { + /* def foo((x)): setup for checking NAME below. */ + ch = CHILD(ch, 0); + } + } + if (TYPE(CHILD(ch, 0)) == NAME) { expr_ty name; if (!strcmp(STR(CHILD(ch, 0)), "None")) { ast_error(CHILD(ch, 0), "assignment to None"); |