Mercurial > cpython-lru_cache-weakref
diff Modules/arraymodule.c @ 47527:52294af4b663 legacy-trunk
This reverts r63675 based on the discussion in this thread:
http://mail.python.org/pipermail/python-dev/2008-June/079988.html
Python 2.6 should stick with PyString_* in its codebase. The PyBytes_* names
in the spirit of 3.0 are available via a #define only. See the email thread.
| author | Gregory P. Smith <greg@mad-scientist.com> |
|---|---|
| date | Mon, 09 Jun 2008 04:58:54 +0000 |
| parents | 4fe192d48960 |
| children | 1c964ed35ef9 |
line wrap: on
line diff
--- a/Modules/arraymodule.c Mon Jun 09 01:28:30 2008 +0000 +++ b/Modules/arraymodule.c Mon Jun 09 04:58:54 2008 +0000 @@ -104,7 +104,7 @@ static PyObject * c_getitem(arrayobject *ap, Py_ssize_t i) { - return PyBytes_FromStringAndSize(&((char *)ap->ob_item)[i], 1); + return PyString_FromStringAndSize(&((char *)ap->ob_item)[i], 1); } static int @@ -1414,7 +1414,7 @@ static PyObject * array_tostring(arrayobject *self, PyObject *unused) { - return PyBytes_FromStringAndSize(self->ob_item, + return PyString_FromStringAndSize(self->ob_item, Py_SIZE(self) * self->ob_descr->itemsize); } @@ -1494,7 +1494,7 @@ array_get_typecode(arrayobject *a, void *closure) { char tc = a->ob_descr->typecode; - return PyBytes_FromStringAndSize(&tc, 1); + return PyString_FromStringAndSize(&tc, 1); } static PyObject * @@ -1578,7 +1578,7 @@ typecode = a->ob_descr->typecode; if (len == 0) { PyOS_snprintf(buf, sizeof(buf), "array('%c')", typecode); - return PyBytes_FromString(buf); + return PyString_FromString(buf); } if (typecode == 'c') @@ -1593,9 +1593,9 @@ Py_XDECREF(v); PyOS_snprintf(buf, sizeof(buf), "array('%c', ", typecode); - s = PyBytes_FromString(buf); - PyBytes_ConcatAndDel(&s, t); - PyBytes_ConcatAndDel(&s, PyBytes_FromString(")")); + s = PyString_FromString(buf); + PyString_ConcatAndDel(&s, t); + PyString_ConcatAndDel(&s, PyString_FromString(")")); return s; } @@ -1881,7 +1881,7 @@ return NULL; if (!(initial == NULL || PyList_Check(initial) - || PyBytes_Check(initial) || PyTuple_Check(initial) + || PyString_Check(initial) || PyTuple_Check(initial) || (c == 'u' && PyUnicode_Check(initial)))) { it = PyObject_GetIter(initial); if (it == NULL) @@ -1924,7 +1924,7 @@ } Py_DECREF(v); } - } else if (initial != NULL && PyBytes_Check(initial)) { + } else if (initial != NULL && PyString_Check(initial)) { PyObject *t_initial, *v; t_initial = PyTuple_Pack(1, initial); if (t_initial == NULL) {