mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-10 00:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Creating an array with a bytes object as initializer

Browse source 
should treat the bytes as it treats a string.
Not doing this broke re.compile() of big charsets.
This commit is contained in:
Guido van Rossum 2007-07-03 16:22:09 +00:00
parent 166746c142
commit 6b826abc70
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Lib/sre_compile.py
View file

@ -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)]

4
Lib/test/test_array.py
View file

@ -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):

4
Modules/arraymodule.c
View file

@ -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) {