diff options
| author | Walter Dörwald <walter@livinglogic.de> | 2007-06-22 12:17:08 (GMT) |
|---|---|---|
| committer | Walter Dörwald <walter@livinglogic.de> | 2007-06-22 12:17:08 (GMT) |
| commit | 2233d27a3f9c946a1c9e3a7dd45728d819170bc0 (patch) | |
| tree | 0cdbd75e212313d866ad52d43fb00813df290439 /Modules/_codecsmodule.c | |
| parent | 63a28be01693584afcadc39ca650efc5fa8f2880 (diff) | |
| download | cpython-2233d27a3f9c946a1c9e3a7dd45728d819170bc0.zip cpython-2233d27a3f9c946a1c9e3a7dd45728d819170bc0.tar.gz cpython-2233d27a3f9c946a1c9e3a7dd45728d819170bc0.tar.bz2 | |
Change readbuffer_encode() and charbuffer_encode() to
return bytes objects.
Diffstat (limited to 'Modules/_codecsmodule.c')
| -rw-r--r-- | Modules/_codecsmodule.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c index de5270d..1199671 100644 --- a/Modules/_codecsmodule.c +++ b/Modules/_codecsmodule.c @@ -533,8 +533,7 @@ readbuffer_encode(PyObject *self, &data, &size, &errors)) return NULL; - return codec_tuple(PyString_FromStringAndSize(data, size), - size); + return codec_tuple(PyBytes_FromStringAndSize(data, size), size); } static PyObject * @@ -549,8 +548,7 @@ charbuffer_encode(PyObject *self, &data, &size, &errors)) return NULL; - return codec_tuple(PyString_FromStringAndSize(data, size), - size); + return codec_tuple(PyBytes_FromStringAndSize(data, size), size); } static PyObject * @@ -569,14 +567,12 @@ unicode_internal_encode(PyObject *self, if (PyUnicode_Check(obj)) { data = PyUnicode_AS_DATA(obj); size = PyUnicode_GET_DATA_SIZE(obj); - return codec_tuple(PyString_FromStringAndSize(data, size), - size); + return codec_tuple(PyBytes_FromStringAndSize(data, size), size); } else { if (PyObject_AsReadBuffer(obj, (const void **)&data, &size)) return NULL; - return codec_tuple(PyString_FromStringAndSize(data, size), - size); + return codec_tuple(PyBytes_FromStringAndSize(data, size), size); } } |