[Python-checkins] cpython (merge 3.2 -> default): Issue #14741: Merge fix from 3.2.

Mon May 7 18:25:24 CEST 2012

http://hg.python.org/cpython/rev/d50577c5711b
changeset: 76825:d50577c5711b
parent: 76823:4815a4a4a852
parent: 76824:2b1cc84bf1d9
user: Mark Dickinson <mdickinson at enthought.com>
date: Mon May 07 17:25:14 2012 +0100
summary:
 Issue #14741: Merge fix from 3.2.
files:
 Lib/test/test_parser.py | 2 ++
 Misc/NEWS | 2 ++
 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
--- a/Lib/test/test_parser.py
+++ b/Lib/test/test_parser.py
@@ -110,6 +110,8 @@
 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
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -20,6 +20,8 @@
 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
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -2419,17 +2419,13 @@
 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;
-- 
Repository URL: http://hg.python.org/cpython
