diff options
author | Yury Selivanov <yselivanov@sprymix.com> | 2015-08-05 21:55:12 (GMT) |
---|---|---|
committer | Yury Selivanov <yselivanov@sprymix.com> | 2015-08-05 21:55:12 (GMT) |
commit | dca249b17c3db2327a89d683f1059b7ed787417e (patch) | |
tree | 2e353017fdeec7d545f86bbce893825fee559b54 /Modules | |
parent | d66f43d3919d1a9fc6e42df0c955701bd18b8f09 (diff) | |
parent | 14acf5f41d2c9b4ec9c0f3219bc9553c31fd9a9f (diff) | |
download | cpython-dca249b17c3db2327a89d683f1059b7ed787417e.zip cpython-dca249b17c3db2327a89d683f1059b7ed787417e.tar.gz cpython-dca249b17c3db2327a89d683f1059b7ed787417e.tar.bz2 |
Merge 3.5 (issue #24791)
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/parsermodule.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c index 2a16dba..8023558 100644 --- a/Modules/parsermodule.c +++ b/Modules/parsermodule.c @@ -2859,8 +2859,8 @@ validate_arglist(node *tree) /* argument: ( test [comp_for] | * test '=' test | - * '**' expr | - * star_expr ) + * '**' test | + * '*' test ) */ static int validate_argument(node *tree) @@ -2873,8 +2873,11 @@ validate_argument(node *tree) if (TYPE(CHILD(tree, 0)) == DOUBLESTAR) { res = validate_test(CHILD(tree, 1)); } + else if (TYPE(CHILD(tree, 0)) == STAR) { + res = validate_test(CHILD(tree, 1)); + } else if (nch == 1) { - res = validate_test_or_star_expr(CHILD(tree, 0)); + res = validate_test(CHILD(tree, 0)); } else if (nch == 2) { res = (validate_test(CHILD(tree, 0)) |