diff options
| author | John Ehresman <jpe@wingware.com> | 2010-04-13 11:48:24 -0400 |
|---|---|---|
| committer | John Ehresman <jpe@wingware.com> | 2010-04-15 12:13:35 -0400 |
| commit | 7611526f31237ce16d2509b7115d83000aa8b080 (patch) | |
| tree | 25de5d96435743e99a8ab20b9c7f18f445ce4ae8 /gio/ginputstream.override | |
| parent | ec3473468d688922c38f2b8e0f0168ab1c774dd7 (diff) | |
| download | pygobject-7611526f31237ce16d2509b7115d83000aa8b080.tar.gz pygobject-7611526f31237ce16d2509b7115d83000aa8b080.tar.xz pygobject-7611526f31237ce16d2509b7115d83000aa8b080.zip | |
Use _PyUnicode or _PyByteArray macros
Diffstat (limited to 'gio/ginputstream.override')
| -rw-r--r-- | gio/ginputstream.override | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gio/ginputstream.override b/gio/ginputstream.override index 260b2fc..917f13a 100644 --- a/gio/ginputstream.override +++ b/gio/ginputstream.override @@ -47,7 +47,7 @@ _wrap_g_input_stream_read(PyGObject *self, PyObject *args, PyObject *kwargs) if (!pygio_check_cancellable(pycancellable, &cancellable)) return NULL; - v = PyString_FromStringAndSize((char *)NULL, buffersize); + v = _PyByteArray_FromStringAndSize((char *)NULL, buffersize); if (v == NULL) return NULL; @@ -57,7 +57,7 @@ _wrap_g_input_stream_read(PyGObject *self, PyObject *args, PyObject *kwargs) pyg_begin_allow_threads; errno = 0; chunksize = g_input_stream_read(G_INPUT_STREAM(self->obj), - PyString_AS_STRING((PyStringObject *)v) + bytesread, + _PyByteArray_AsString(v) + bytesread, buffersize - bytesread, cancellable, &error); pyg_end_allow_threads; @@ -81,7 +81,7 @@ _wrap_g_input_stream_read(PyGObject *self, PyObject *args, PyObject *kwargs) if (count < 0) { buffersize += BUFSIZE; - if (_PyString_Resize(&v, buffersize) < 0) + if (_PyByteArray_Resize(&v, buffersize) < 0) return NULL; } else { @@ -91,7 +91,7 @@ _wrap_g_input_stream_read(PyGObject *self, PyObject *args, PyObject *kwargs) } if (bytesread != buffersize) - _PyString_Resize(&v, bytesread); + _PyByteArray_Resize(&v, bytesread); return v; } @@ -119,7 +119,7 @@ _wrap_g_input_stream_read_all(PyGObject *self, PyObject *args, PyObject *kwargs) if (!pygio_check_cancellable(pycancellable, &cancellable)) return NULL; - v = PyString_FromStringAndSize((char *)NULL, buffersize); + v = _PyByteArray_FromStringAndSize((char *)NULL, buffersize); if (v == NULL) return NULL; @@ -129,7 +129,7 @@ _wrap_g_input_stream_read_all(PyGObject *self, PyObject *args, PyObject *kwargs) pyg_begin_allow_threads; errno = 0; g_input_stream_read_all(G_INPUT_STREAM(self->obj), - PyString_AS_STRING((PyStringObject *)v) + bytesread, + _PyByteArray_AsString(v) + bytesread, buffersize - bytesread, &chunksize, cancellable, &error); @@ -148,7 +148,7 @@ _wrap_g_input_stream_read_all(PyGObject *self, PyObject *args, PyObject *kwargs) if (count < 0) { buffersize += BUFSIZE; - if (_PyString_Resize(&v, buffersize) < 0) + if (_PyByteArray_Resize(&v, buffersize) < 0) return NULL; } else { @@ -158,7 +158,7 @@ _wrap_g_input_stream_read_all(PyGObject *self, PyObject *args, PyObject *kwargs) } if (bytesread != buffersize) - _PyString_Resize(&v, bytesread); + _PyByteArray_Resize(&v, bytesread); return v; } @@ -241,10 +241,10 @@ _wrap_g_input_stream_read_finish(PyGObject *self, return NULL; if (bytesread == 0) - return PyString_FromString(""); + return _PyByteArray_FromStringAndSize("", 0); notify = pygio_notify_get_attached(result); - return PyString_FromStringAndSize(notify->buffer, bytesread); + return _PyByteArray_FromStringAndSize(notify->buffer, bytesread); } %% override g_input_stream_close_async kwargs |