Commit 6b826abc authored by Guido van Rossum's avatar Guido van Rossum

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.
parent 166746c1
...@@ -353,6 +353,7 @@ def _optimize_unicode(charset, fixup): ...@@ -353,6 +353,7 @@ def _optimize_unicode(charset, fixup):
# Convert byte array to word array # Convert byte array to word array
mapping = array.array(code, mapping) mapping = array.array(code, mapping)
assert mapping.itemsize == _sre.CODESIZE assert mapping.itemsize == _sre.CODESIZE
assert len(mapping) * mapping.itemsize == 256
header = header + mapping.tolist() header = header + mapping.tolist()
data[0:0] = header data[0:0] = header
return [(BIGCHARSET, data)] return [(BIGCHARSET, data)]
......
...@@ -700,6 +700,10 @@ class BaseTest(unittest.TestCase): ...@@ -700,6 +700,10 @@ class BaseTest(unittest.TestCase):
# SF bug #1486663 -- this used to erroneously raise a TypeError # SF bug #1486663 -- this used to erroneously raise a TypeError
ArraySubclassWithKwargs('b', newarg=1) 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): class StringTest(BaseTest):
......
...@@ -1789,6 +1789,7 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -1789,6 +1789,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)
|| PyBytes_Check(initial)
|| PyString_Check(initial) || PyTuple_Check(initial) || PyString_Check(initial) || PyTuple_Check(initial)
|| (c == 'u' && PyUnicode_Check(initial)))) { || (c == 'u' && PyUnicode_Check(initial)))) {
it = PyObject_GetIter(initial); it = PyObject_GetIter(initial);
...@@ -1832,7 +1833,8 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -1832,7 +1833,8 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
} }
Py_DECREF(v); Py_DECREF(v);
} }
} else if (initial != NULL && PyString_Check(initial)) { } else if (initial != NULL &&
(PyString_Check(initial) || PyBytes_Check(initial))) {
PyObject *t_initial, *v; PyObject *t_initial, *v;
t_initial = PyTuple_Pack(1, initial); t_initial = PyTuple_Pack(1, initial);
if (t_initial == NULL) { if (t_initial == NULL) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment