diff options
Diffstat (limited to 'glib/pygiochannel.c')
| -rw-r--r-- | glib/pygiochannel.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/glib/pygiochannel.c b/glib/pygiochannel.c index d01dd40..544d3dd 100644 --- a/glib/pygiochannel.c +++ b/glib/pygiochannel.c @@ -204,16 +204,16 @@ py_io_channel_read_chars(PyGIOChannel* self, PyObject *args, PyObject *kwargs) } if ( ret_obj == NULL ) { - ret_obj = _PyByteArray_FromStringAndSize((char *)NULL, buf_size); + ret_obj = PYGLIB_PyBytes_FromStringAndSize((char *)NULL, buf_size); if (ret_obj == NULL) goto failure; } - else if (buf_size + total_read > _PyByteArray_Size(ret_obj)) { - if (_PyByteArray_Resize(&ret_obj, buf_size + total_read) == -1) + else if (buf_size + total_read > PYGLIB_PyBytes_Size(ret_obj)) { + if (PYGLIB_PyBytes_Resize(&ret_obj, buf_size + total_read) == -1) goto failure; } - buf = _PyByteArray_AsString(ret_obj) + total_read; + buf = PYGLIB_PyBytes_AsString(ret_obj) + total_read; pyglib_unblock_threads(); status = g_io_channel_read_chars(self->channel, buf, buf_size, @@ -225,8 +225,8 @@ py_io_channel_read_chars(PyGIOChannel* self, PyObject *args, PyObject *kwargs) total_read += single_read; } - if ( total_read != _PyByteArray_Size(ret_obj) ) { - if (_PyByteArray_Resize(&ret_obj, total_read) == -1) + if ( total_read != PYGLIB_PyBytes_Size(ret_obj) ) { + if (PYGLIB_PyBytes_Resize(&ret_obj, total_read) == -1) goto failure; } @@ -237,7 +237,7 @@ py_io_channel_read_chars(PyGIOChannel* self, PyObject *args, PyObject *kwargs) { PyObject *unicode_obj; - unicode_obj = PyUnicode_FromString(PyByteArray_AS_STRING(ret_obj)); + unicode_obj = PyUnicode_FromString(PyBytes_AS_STRING(ret_obj)); if (unicode_obj == NULL) goto failure; Py_DECREF(ret_obj); |