Author: guido.van.rossum
Date: Tue Jul 3 18:22:09 2007
New Revision: 56161
Modified:
python/branches/py3k-struni/Lib/sre_compile.py
python/branches/py3k-struni/Lib/test/test_array.py
python/branches/py3k-struni/Modules/arraymodule.c
Log:
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.
Modified: python/branches/py3k-struni/Lib/sre_compile.py
==============================================================================
--- python/branches/py3k-struni/Lib/sre_compile.py (original)
+++ python/branches/py3k-struni/Lib/sre_compile.py Tue Jul 3 18:22:09 2007
@@ -353,6 +353,7 @@
# 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)]
Modified: python/branches/py3k-struni/Lib/test/test_array.py
==============================================================================
--- python/branches/py3k-struni/Lib/test/test_array.py (original)
+++ python/branches/py3k-struni/Lib/test/test_array.py Tue Jul 3 18:22:09 2007
@@ -700,6 +700,10 @@
# 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):
Modified: python/branches/py3k-struni/Modules/arraymodule.c
==============================================================================
--- python/branches/py3k-struni/Modules/arraymodule.c (original)
+++ python/branches/py3k-struni/Modules/arraymodule.c Tue Jul 3 18:22:09 2007
@@ -1789,6 +1789,7 @@
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 @@
}
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) {
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
