diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2007-07-28 17:51:59 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2007-07-28 17:51:59 (GMT) |
| commit | f3f0c611dd6212e87b8ead06f531ee109ab2d5d3 (patch) | |
| tree | ebcb26b4892c2374e134e825b1a3588df0e768e1 | |
| parent | f30bb0eba2d5aeefba5afc5fbc00a0c1ef9c271e (diff) | |
| download | cpython-f3f0c611dd6212e87b8ead06f531ee109ab2d5d3.zip cpython-f3f0c611dd6212e87b8ead06f531ee109ab2d5d3.tar.gz cpython-f3f0c611dd6212e87b8ead06f531ee109ab2d5d3.tar.bz2 | |
Return bytes, not str8.
| -rw-r--r-- | Modules/cStringIO.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Modules/cStringIO.c b/Modules/cStringIO.c index 16d4173..4570605 100644 --- a/Modules/cStringIO.c +++ b/Modules/cStringIO.c @@ -118,8 +118,8 @@ PyDoc_STRVAR(IO_getval__doc__, static PyObject * IO_cgetval(PyObject *self) { if (!IO__opencheck(IOOOBJECT(self))) return NULL; - return PyString_FromStringAndSize(((IOobject*)self)->buf, - ((IOobject*)self)->pos); + return PyBytes_FromStringAndSize(((IOobject*)self)->buf, + ((IOobject*)self)->pos); } static PyObject * @@ -136,7 +136,7 @@ IO_getval(IOobject *self, PyObject *args) { } else s=self->string_size; - return PyString_FromStringAndSize(self->buf, s); + return PyBytes_FromStringAndSize(self->buf, s); } PyDoc_STRVAR(IO_isatty__doc__, "isatty(): always returns 0"); @@ -176,7 +176,7 @@ IO_read(IOobject *self, PyObject *args) { if ( (n=IO_cread((PyObject*)self,&output,n)) < 0) return NULL; - return PyString_FromStringAndSize(output, n); + return PyBytes_FromStringAndSize(output, n); } PyDoc_STRVAR(IO_readline__doc__, "readline() -- Read one line"); @@ -214,7 +214,7 @@ IO_readline(IOobject *self, PyObject *args) { n -= m; self->pos -= m; } - return PyString_FromStringAndSize(output, n); + return PyBytes_FromStringAndSize(output, n); } PyDoc_STRVAR(IO_readlines__doc__, "readlines() -- Read all lines"); @@ -237,7 +237,7 @@ IO_readlines(IOobject *self, PyObject *args) { goto err; if (n == 0) break; - line = PyString_FromStringAndSize (output, n); + line = PyBytes_FromStringAndSize (output, n); if (!line) goto err; if (PyList_Append (result, line) == -1) { @@ -314,7 +314,7 @@ IO_iternext(Iobject *self) next = IO_readline((IOobject *)self, NULL); if (!next) return NULL; - if (!PyString_GET_SIZE(next)) { + if (!PyBytes_GET_SIZE(next)) { Py_DECREF(next); PyErr_SetNone(PyExc_StopIteration); return NULL; |