diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2007-07-28 17:57:00 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2007-07-28 17:57:00 +0000 |
| commit | a9e250eb8b233a23f7914d07970faa22f8991dfb (patch) | |
| tree | 19ce6e0ba2bdc859633cfd22fffa98d9b8c919c4 | |
| parent | 830c4cc3559f886a64853b6a1b21d8463f12bf91 (diff) | |
| download | cpython-a9e250eb8b233a23f7914d07970faa22f8991dfb.tar.gz | |
Revert previous checkin.
| -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 4570605cfc..16d41733b4 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 PyBytes_FromStringAndSize(((IOobject*)self)->buf, - ((IOobject*)self)->pos); + return PyString_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 PyBytes_FromStringAndSize(self->buf, s); + return PyString_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 PyBytes_FromStringAndSize(output, n); + return PyString_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 PyBytes_FromStringAndSize(output, n); + return PyString_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 = PyBytes_FromStringAndSize (output, n); + line = PyString_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 (!PyBytes_GET_SIZE(next)) { + if (!PyString_GET_SIZE(next)) { Py_DECREF(next); PyErr_SetNone(PyExc_StopIteration); return NULL; |