Issue #5109: array.array constructor will now use fast code when
initial data is provided in an array object with correct type.
diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py
index 33fb244..5190c35 100755
--- a/Lib/test/test_array.py
+++ b/Lib/test/test_array.py
@@ -398,6 +398,11 @@
if a.itemsize>1:
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):
a = array.array(self.typecode, 2*self.example)
self.assertEqual(a, eval(repr(a), {"array": array.array}))
@@ -1113,6 +1118,11 @@
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):
example = [-1, 0, 1, 42, 0x7f]
smallerexample = [-1, 0, 1, 42, 0x7e]
diff --git a/Misc/NEWS b/Misc/NEWS
index b123cb1..262f982 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -955,6 +955,9 @@
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 can accept non ascii filename.
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 77a162c..fe6106c 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -2405,7 +2405,9 @@
|| PyByteArray_Check(initial)
|| PyBytes_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);
if (it == NULL)
return NULL;
@@ -2421,17 +2423,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 =
@@ -2482,6 +2487,11 @@
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 (array_iter_extend((arrayobject *)a, it) == -1) {
Py_DECREF(it);