Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

SF 686323: Minor array module enhancements 

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