Mercurial > cpython-lru_cache-weakref
diff Modules/arraymodule.c @ 67539:ec96b5b5723b 2.7
Merged revisions 87942 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87942 | alexander.belopolsky | 2011-01-11 16:44:00 -0500 (Tue, 11 Jan 2011) | 3 lines
Issue #5109: array.array constructor will now use fast code when
initial data is provided in an array object with correct type.
........
| author | Alexander Belopolsky <alexander.belopolsky@gmail.com> |
|---|---|
| date | Tue, 11 Jan 2011 22:16:24 +0000 |
| parents | b906e9e5f2a7 |
| children | 1b1a64297149 |
line wrap: on
line diff
--- a/Modules/arraymodule.c Tue Jan 11 15:35:23 2011 +0000 +++ b/Modules/arraymodule.c Tue Jan 11 22:16:24 2011 +0000 @@ -1925,7 +1925,10 @@ if (!(initial == NULL || PyList_Check(initial) || PyString_Check(initial) || PyTuple_Check(initial) - || (c == 'u' && PyUnicode_Check(initial)))) { + || PyTuple_Check(initial) + || ((c=='u') && PyUnicode_Check(initial)) + || (array_Check(initial) + && c == ((arrayobject*)initial)->ob_descr->typecode))) { it = PyObject_GetIter(initial); if (it == NULL) return NULL; @@ -1941,17 +1944,20 @@ PyObject *a; Py_ssize_t len; - if (initial == NULL || !(PyList_Check(initial) - || PyTuple_Check(initial))) + if (initial == NULL) len = 0; + else if (PyList_Check(initial)) + len = PyList_GET_SIZE(initial); + else if (PyTuple_Check(initial) || array_Check(initial)) + len = Py_SIZE(initial); else - len = PySequence_Size(initial); + len = 0; a = newarrayobject(type, len, descr); if (a == NULL) return NULL; - if (len > 0) { + if (len > 0 && !array_Check(initial)) { Py_ssize_t i; for (i = 0; i < len; i++) { PyObject *v = @@ -2001,6 +2007,11 @@ } #endif } + else if (initial != NULL && array_Check(initial)) { + arrayobject *self = (arrayobject *)a; + arrayobject *other = (arrayobject *)initial; + memcpy(self->ob_item, other->ob_item, len * other->ob_descr->itemsize); + } if (it != NULL) { if (array_iter_extend((arrayobject *)a, it) == -1) { Py_DECREF(it);