Commit 85dbec6d authored by Neal Norwitz's avatar Neal Norwitz

Bug #1588287: fix invalid assertion for `1,2` in debug builds.

Will backport
parent 5310e507
...@@ -747,6 +747,8 @@ hello world ...@@ -747,6 +747,8 @@ hello world
x = `x` x = `x`
x = `1 or 2 or 3` x = `1 or 2 or 3`
self.assertEqual(`1,2`, '(1, 2)')
x = x x = x
x = 'x' x = 'x'
x = 123 x = 123
......
...@@ -12,6 +12,8 @@ What's New in Python 2.6 alpha 1? ...@@ -12,6 +12,8 @@ What's New in Python 2.6 alpha 1?
Core and builtins 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 - Bug #1576657: when setting a KeyError for a tuple key, make sure that
the tuple isn't used as the "exception arguments tuple". the tuple isn't used as the "exception arguments tuple".
......
...@@ -532,6 +532,7 @@ seq_for_testlist(struct compiling *c, const node *n) ...@@ -532,6 +532,7 @@ seq_for_testlist(struct compiling *c, const node *n)
|| TYPE(n) == listmaker || TYPE(n) == listmaker
|| TYPE(n) == testlist_gexp || TYPE(n) == testlist_gexp
|| TYPE(n) == testlist_safe || TYPE(n) == testlist_safe
|| TYPE(n) == testlist1
); );
seq = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena); seq = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment