From: Mark Dickinson <dickinsm@gmail.com>
Date: Mon, 26 Oct 2009 14:19:42 +0000 (+0000)
Subject: Merged revisions 75714 via svnmerge from
X-Git-Tag: v3.2a1~2324
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9acadc54e032e13421c8f3ca50e58e7169352891;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 75714 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75714 | mark.dickinson | 2009-10-26 14:18:44 +0000 (Mon, 26 Oct 2009) | 1 line

  Warn against replacing PyNumber_Add with PyNumber_InPlaceAdd in sum
........
---

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index ab6049cabff3..297c795ca372 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1958,6 +1958,15 @@ builtin_sum(PyObject *self, PyObject *args)
 			}
 			break;
 		}
+		/* It's tempting to use PyNumber_InPlaceAdd instead of
+		   PyNumber_Add here, to avoid quadratic running time
+		   when doing 'sum(list_of_lists, [])'.  However, this
+		   would produce a change in behaviour: a snippet like
+
+		     empty = []
+		     sum([[x] for x in range(10)], empty)
+
+		   would change the value of empty. */
 		temp = PyNumber_Add(result, item);
 		Py_DECREF(result);
 		Py_DECREF(item);