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.
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 @@
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");