mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

SF 686323: Minor array module enhancements

Browse source 
Allows use of tuples for the initializer.
This commit is contained in:
Raymond Hettinger 2003-04-24 10:41:55 +00:00
parent f4cf76dd5e
commit 84fc9aa6ce
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Modules/arraymodule.c
View file

@ -1732,7 +1732,7 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return NULL; return NULL;
if (!(initial == NULL || PyList_Check(initial) if (!(initial == NULL || PyList_Check(initial)
|| PyString_Check(initial) || PyString_Check(initial) || PyTuple_Check(initial)
|| (c == 'u' && PyUnicode_Check(initial)))) { || (c == 'u' && PyUnicode_Check(initial)))) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"array initializer must be list or string"); "array initializer must be list or string");
@ -1742,10 +1742,12 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
if (descr->typecode == c) { if (descr->typecode == c) {
PyObject *a; PyObject *a;
int len; int len;
if (initial == NULL || !PyList_Check(initial))
if (initial == NULL || !(PyList_Check(initial)
|| PyTuple_Check(initial)))
len = 0; len = 0;
else else
len = PyList_Size(initial); len = PySequence_Size(initial);
a = newarrayobject(type, len, descr); a = newarrayobject(type, len, descr);
if (a == NULL) if (a == NULL)
@ -1755,7 +1757,7 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
int i; int i;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
PyObject *v = PyObject *v =
PyList_GetItem(initial, i); PySequence_GetItem(initial, i);
if (setarrayitem(a, i, v) != 0) { if (setarrayitem(a, i, v) != 0) {
Py_DECREF(a); Py_DECREF(a);
return NULL; return NULL;