diff options
| author | Larry Hastings <larry@hastings.org> | 2015-02-26 13:58:48 (GMT) |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2015-02-26 13:58:48 (GMT) |
| commit | 8c3ec536e924002dc3afe4ff92e32fe9ed82ebab (patch) | |
| tree | f141eec287584ba9d58d32461e1a7d92b5466e91 /Objects/listobject.c | |
| parent | e287746401398ee81c8e8a1513a5fe828eb32559 (diff) | |
| parent | 7b2c3c6840052ea6f8b41253faf38b9e24f9a453 (diff) | |
| download | cpython-8c3ec536e924002dc3afe4ff92e32fe9ed82ebab.zip cpython-8c3ec536e924002dc3afe4ff92e32fe9ed82ebab.tar.gz cpython-8c3ec536e924002dc3afe4ff92e32fe9ed82ebab.tar.bz2 | |
Merge 3.4.3 release engineering changes back into 3.4.
Diffstat (limited to 'Objects/listobject.c')
| -rw-r--r-- | Objects/listobject.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Objects/listobject.c b/Objects/listobject.c index fd5a72a..b6c1d78 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -1832,7 +1832,8 @@ merge_collapse(MergeState *ms) 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) |