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

Issue #5109: array.array constructor will now use fast code when

Browse source 
initial data is provided in an array object with correct type.
This commit is contained in:
Alexander Belopolsky 2011-01-11 21:44:00 +00:00
parent cf8a382c94
commit ef4a03fffe
3 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/test/test_array.py
View file

@ -398,6 +398,11 @@ class BaseTest(unittest.TestCase):
if a.itemsize>1: if a.itemsize>1:
self.assertRaises(ValueError, b.frombytes, b"x") self.assertRaises(ValueError, b.frombytes, b"x")
def test_fromarray(self):
a = array.array(self.typecode, self.example)
b = array.array(self.typecode, a)
self.assertEqual(a, b)
def test_repr(self): def test_repr(self):
a = array.array(self.typecode, 2*self.example) a = array.array(self.typecode, 2*self.example)
self.assertEqual(a, eval(repr(a), {"array": array.array})) self.assertEqual(a, eval(repr(a), {"array": array.array}))
@ -1113,6 +1118,11 @@ class NumberTest(BaseTest):
self.assertRaises(AttributeError, setattr, a, "color", "blue") self.assertRaises(AttributeError, setattr, a, "color", "blue")
def test_frombytearray(self):
a = array.array('b', range(10))
b = array.array(self.typecode, a)
self.assertEqual(a, b)
class SignedNumberTest(NumberTest): class SignedNumberTest(NumberTest):
example = [-1, 0, 1, 42, 0x7f] example = [-1, 0, 1, 42, 0x7f]
smallerexample = [-1, 0, 1, 42, 0x7e] smallerexample = [-1, 0, 1, 42, 0x7e]

3
Misc/NEWS
View file

@ -955,6 +955,9 @@ Library
Extension Modules Extension Modules
----------------- -----------------
- Issue #5109: array.array constructor will now use fast code when
initial data is provided in an array object with correct type.
- Issue #6317: Now winsound.PlaySound only accepts unicode. - Issue #6317: Now winsound.PlaySound only accepts unicode.
- Issue #6317: Now winsound.PlaySound can accept non ascii filename. - Issue #6317: Now winsound.PlaySound can accept non ascii filename.

20
Modules/arraymodule.c
View file

@ -2405,7 +2405,9 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|| PyByteArray_Check(initial) || PyByteArray_Check(initial)
|| PyBytes_Check(initial) || PyBytes_Check(initial)
|| PyTuple_Check(initial) || PyTuple_Check(initial)
|| ((c=='u') && PyUnicode_Check(initial)))) { || ((c=='u') && PyUnicode_Check(initial))
|| (array_Check(initial)
&& c == ((arrayobject*)initial)->ob_descr->typecode))) {
it = PyObject_GetIter(initial); it = PyObject_GetIter(initial);
if (it == NULL) if (it == NULL)
return NULL; return NULL;
@ -2421,17 +2423,20 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
PyObject *a; PyObject *a;
Py_ssize_t len; Py_ssize_t len;
if (initial == NULL || !(PyList_Check(initial) if (initial == NULL)
|| PyTuple_Check(initial)))
len = 0; 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 else
len = PySequence_Size(initial); len = 0;
a = newarrayobject(type, len, descr); a = newarrayobject(type, len, descr);
if (a == NULL) if (a == NULL)
return NULL; return NULL;
if (len > 0) { if (len > 0 && !array_Check(initial)) {
Py_ssize_t i; Py_ssize_t i;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
PyObject *v = PyObject *v =
@ -2482,6 +2487,11 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
self->allocated = Py_SIZE(self); self->allocated = Py_SIZE(self);
} }
} }
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 (it != NULL) {
if (array_iter_extend((arrayobject *)a, it) == -1) { if (array_iter_extend((arrayobject *)a, it) == -1) {
Py_DECREF(it); Py_DECREF(it);