summaryrefslogtreecommitdiffstats
path: root/Modules/arraymodule.c
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2007-08-26 04:51:28 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2007-08-26 04:51:28 (GMT)
commit3fcbea567b65ca26e25f082259f1493330e32936 (patch)
tree5ec25a0188b53b42992ee3e1c1b86680336da02b /Modules/arraymodule.c
parented2b7397a0558414e1ec61c48bc889bb05e261ea (diff)
downloadcpython-3fcbea567b65ca26e25f082259f1493330e32936.zip
cpython-3fcbea567b65ca26e25f082259f1493330e32936.tar.gz
cpython-3fcbea567b65ca26e25f082259f1493330e32936.tar.bz2
Use unicode and remove support for some uses of str8.
Diffstat (limited to 'Modules/arraymodule.c')
-rw-r--r--Modules/arraymodule.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index eb26698..65c0bf0 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -1819,7 +1819,7 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
if (!(initial == NULL || PyList_Check(initial)
|| PyBytes_Check(initial)
- || PyString_Check(initial) || PyTuple_Check(initial)
+ || PyTuple_Check(initial)
|| (c == PyArr_UNI && PyUnicode_Check(initial)))) {
it = PyObject_GetIter(initial);
if (it == NULL)
@@ -1862,8 +1862,7 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
}
Py_DECREF(v);
}
- } else if (initial != NULL &&
- (PyString_Check(initial) || PyBytes_Check(initial))) {
+ } else if (initial != NULL && PyBytes_Check(initial)) {
PyObject *t_initial, *v;
t_initial = PyTuple_Pack(1, initial);
if (t_initial == NULL) {