diff options
| author | Mark Dickinson <mdickinson@enthought.com> | 2012-05-07 17:25:14 +0100 |
|---|---|---|
| committer | Mark Dickinson <mdickinson@enthought.com> | 2012-05-07 17:25:14 +0100 |
| commit | 943cab2fec8e7fb3232e72d9f1ca6535674e746a (patch) | |
| tree | 94dc564794188e6c61b0bc9bf23c9dd322a14be3 | |
| parent | 72f6095d4fc50c0e92ea0f88df898ffe67cdb67c (diff) | |
| parent | da029fb293d7b389ad54bd843966a266fb4de615 (diff) | |
| download | cpython-git-943cab2fec8e7fb3232e72d9f1ca6535674e746a.tar.gz | |
Issue #14741: Merge fix from 3.2.
| -rw-r--r-- | Lib/test/test_parser.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/parsermodule.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Lib/test/test_parser.py b/Lib/test/test_parser.py index f91131969f..e199728bc0 100644 --- a/Lib/test/test_parser.py +++ b/Lib/test/test_parser.py @@ -110,6 +110,8 @@ class RoundtripLegalSyntaxTestCase(unittest.TestCase): self.check_expr("lambda x, *y, **z: 0") self.check_expr("(x for x in range(10))") self.check_expr("foo(x for x in range(10))") + self.check_expr("...") + self.check_expr("a[...]") def test_simple_expression(self): # expr_stmt @@ -20,6 +20,8 @@ Core and Builtins Library ------- +- Issue #14741: Fix missing support for Ellipsis ('...') in parser module. + - Issue #14697: Fix missing support for set displays and set comprehensions in parser module. diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c index 994de4940d..b9c1201a9d 100644 --- a/Modules/parsermodule.c +++ b/Modules/parsermodule.c @@ -2419,17 +2419,13 @@ validate_atom(node *tree) break; case NAME: case NUMBER: + case ELLIPSIS: res = (nch == 1); break; case STRING: for (pos = 1; res && (pos < nch); ++pos) res = validate_ntype(CHILD(tree, pos), STRING); break; - case DOT: - res = (nch == 3 && - validate_ntype(CHILD(tree, 1), DOT) && - validate_ntype(CHILD(tree, 2), DOT)); - break; default: res = 0; break; |