From 97bc6182297ab383d54dca4b85fe656a658e7f0d Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Thu, 11 Mar 2004 07:34:19 +0000 Subject: list_inplace_concat() is now expressed in terms of list_extend() which avoids creating an intermediate tuple for iterable arguments other than lists or tuples. In other words, a+=b no longer requires extra memory when b is not a list or tuple. The list and tuple cases are unchanged. --- Objects/listobject.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/Objects/listobject.c b/Objects/listobject.c index b61d7da..6bb6d8c7 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -708,20 +708,6 @@ listextend_internal(PyListObject *self, PyObject *b) } static PyObject * -list_inplace_concat(PyListObject *self, PyObject *other) -{ - other = PySequence_Fast(other, "argument to += must be iterable"); - if (!other) - return NULL; - - if (listextend_internal(self, other) < 0) - return NULL; - - Py_INCREF(self); - return (PyObject *)self; -} - -static PyObject * listextend(PyListObject *self, PyObject *b) { PyObject *it; /* iter(v) */ @@ -791,6 +777,19 @@ listextend(PyListObject *self, PyObject *b) } static PyObject * +list_inplace_concat(PyListObject *self, PyObject *other) +{ + PyObject *result; + + result = listextend(self, other); + if (result == NULL) + return result; + Py_DECREF(result); + Py_INCREF(self); + return (PyObject *)self; +} + +static PyObject * listpop(PyListObject *self, PyObject *args) { int i = -1; -- cgit v0.12