From: Guido van Rossum <guido@python.org>
Date: Tue, 3 Jul 2007 16:22:09 +0000 (+0000)
Subject: Creating an array with a bytes object as initializer
X-Git-Tag: v3.0a1~733
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b826abc707eb101f8426382487de88cd4e7b046;p=python

Creating an array with a bytes object as initializer
should treat the bytes as it treats a string.
Not doing this broke re.compile() of big charsets.
---

diff --git a/Lib/sre_compile.py b/Lib/sre_compile.py
index 6b280520b3..5b660844b3 100644
--- a/Lib/sre_compile.py
+++ b/Lib/sre_compile.py
@@ -353,6 +353,7 @@ def _optimize_unicode(charset, fixup):
     # Convert byte array to word array
     mapping = array.array(code, mapping)
     assert mapping.itemsize == _sre.CODESIZE
+    assert len(mapping) * mapping.itemsize == 256
     header = header + mapping.tolist()
     data[0:0] = header
     return [(BIGCHARSET, data)]
diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py
index 9b11edfc7e..cf5c2e8c09 100755
--- a/Lib/test/test_array.py
+++ b/Lib/test/test_array.py
@@ -700,6 +700,10 @@ class BaseTest(unittest.TestCase):
         # SF bug #1486663 -- this used to erroneously raise a TypeError
         ArraySubclassWithKwargs('b', newarg=1)
 
+    def test_create_from_bytes(self):
+        a = array.array('H', b"1234")
+        self.assertEqual(len(a) * a.itemsize, 4)
+
 
 class StringTest(BaseTest):
 
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 253907757a..11819e271f 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -1789,6 +1789,7 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 		return NULL;
 
 	if (!(initial == NULL || PyList_Check(initial)
+	      || PyBytes_Check(initial)
 	      || PyString_Check(initial) || PyTuple_Check(initial)
 	      || (c == 'u' && PyUnicode_Check(initial)))) {
 		it = PyObject_GetIter(initial);
@@ -1832,7 +1833,8 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 					}
 					Py_DECREF(v);
 				}
-			} else if (initial != NULL && PyString_Check(initial)) {
+			} else if (initial != NULL &&
+				   (PyString_Check(initial) || PyBytes_Check(initial))) {
 				PyObject *t_initial, *v;
 				t_initial = PyTuple_Pack(1, initial);
 				if (t_initial == NULL) {