summaryrefslogtreecommitdiffstats
path: root/Modules/arraymodule.c
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-07-03 16:22:09 (GMT)
committerGuido van Rossum <guido@python.org>2007-07-03 16:22:09 (GMT)
commit6b826abc707eb101f8426382487de88cd4e7b046 (patch)
tree4f56a78f9a4108866b265a7acbd89ba5e3aa6994 /Modules/arraymodule.c
parent166746c142a88d4f27541f6102154cc592f208ee (diff)
downloadcpython-6b826abc707eb101f8426382487de88cd4e7b046.zip
cpython-6b826abc707eb101f8426382487de88cd4e7b046.tar.gz
cpython-6b826abc707eb101f8426382487de88cd4e7b046.tar.bz2
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.
Diffstat (limited to 'Modules/arraymodule.c')
-rw-r--r--Modules/arraymodule.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 2539077..11819e2 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) {