[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#23515)

[benjamin.peterson]

https://hg.python.org/cpython/rev/be5ddc8b6a88
changeset:   94746:be5ddc8b6a88
parent:      94743:a727eed3a811
parent:      94745:620cb13008b7
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Feb 25 10:16:56 2015 -0500
summary:
  merge 3.4 (#23515)

files:
  Objects/listobject.c |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Objects/listobject.c b/Objects/listobject.c
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -1832,7 +1832,8 @@
     assert(ms);
     while (ms->n > 1) {
         Py_ssize_t n = ms->n - 2;
-        if (n > 0 && p[n-1].len <= p[n].len + p[n+1].len) {
+        if ((n > 0 && p[n-1].len <= p[n].len + p[n+1].len) ||
+            (n > 1 && p[n-2].len <= p[n-1].len + p[n].len)) {
             if (p[n-1].len < p[n+1].len)
                 --n;
             if (merge_at(ms, n) < 0)

-- 
Repository URL: https://hg.python.org/cpython