[Python-checkins] r52622 - in python/branches/release25-maint: Lib/test/test_grammar.py Misc/NEWS Python/ast.c

[neal.norwitz]

Author: neal.norwitz
Date: Sat Nov  4 20:32:54 2006
New Revision: 52622

Modified:
   python/branches/release25-maint/Lib/test/test_grammar.py
   python/branches/release25-maint/Misc/NEWS
   python/branches/release25-maint/Python/ast.c
Log:
Backport 52621:
Bug #1588287: fix invalid assertion for `1,2` in debug builds.


Modified: python/branches/release25-maint/Lib/test/test_grammar.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_grammar.py	(original)
+++ python/branches/release25-maint/Lib/test/test_grammar.py	Sat Nov  4 20:32:54 2006
@@ -709,6 +709,7 @@
 
 x = `x`
 x = `1 or 2 or 3`
+x = `1,2`
 x = x
 x = 'x'
 x = 123

Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Sat Nov  4 20:32:54 2006
@@ -12,6 +12,8 @@
 Core and builtins
 -----------------
 
+- Bug #1588287: fix invalid assertion for `1,2` in debug builds.
+
 - Bug #1576657: when setting a KeyError for a tuple key, make sure that
   the tuple isn't used as the "exception arguments tuple".
 

Modified: python/branches/release25-maint/Python/ast.c
==============================================================================
--- python/branches/release25-maint/Python/ast.c	(original)
+++ python/branches/release25-maint/Python/ast.c	Sat Nov  4 20:32:54 2006
@@ -538,6 +538,7 @@
 	   || TYPE(n) == listmaker
 	   || TYPE(n) == testlist_gexp
 	   || TYPE(n) == testlist_safe
+	   || TYPE(n) == testlist1
 	   );
 
     seq = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);