Wrap gio.DataInputStream.read_line_async and read_until_async

Wrap the functions and their corresponding *_finish() functions.
Create 'gdatainputstream.override' for these and move two existing
functions there.  Add unit tests.  Re-enable synchronous read_line
unit test and adjust it for new official GIO behavior.  Bug #584285.

1 files changed, 0 insertions, 65 deletions

diff --git a/gio/ginputstream.override b/gio/ginputstream.override
index 7518b3f..075a20c 100644
--- a/gio/ginputstream.override
+++ b/gio/ginputstream.override
@@ -293,71 +293,6 @@ _wrap_g_input_stream_close_async(PyGObject *self,
     return NULL;
 }
 %%
-override g_data_input_stream_read_line kwargs
-static PyObject *
-_wrap_g_data_input_stream_read_line(PyGObject *self,
-				    PyObject *args,
-				    PyObject *kwargs)
-{
-    static char *kwlist[] = { "cancellable", NULL };
-    PyGObject *pycancellable = NULL;
-    GCancellable *cancellable;
-    char *line;
-    gsize length;
-    PyObject *py_line;
-    GError *error = NULL;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-				     "|O:gio.DataInputStream.read_line",
-                                     kwlist, &pycancellable))
-        return NULL;
-
-    if (!pygio_check_cancellable(pycancellable, &cancellable))
-	return NULL;
-
-    line = g_data_input_stream_read_line(G_DATA_INPUT_STREAM(self->obj),
-					 &length, cancellable, &error);
-    if (pyg_error_check(&error))
-        return NULL;
-
-    py_line = PyString_FromStringAndSize(line, length);
-    g_free(line);
-    return py_line;
-}
-%%
-override g_data_input_stream_read_until kwargs
-static PyObject *
-_wrap_g_data_input_stream_read_until(PyGObject *self,
-				     PyObject *args,
-				     PyObject *kwargs)
-{
-    static char *kwlist[] = { "stop_chars", "cancellable", NULL };
-    const char *stop_chars;
-    PyGObject *pycancellable = NULL;
-    GCancellable *cancellable;
-    char *line;
-    gsize length;
-    PyObject *py_line;
-    GError *error = NULL;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-				     "s|O:gio.DataInputStream.read_line",
-                                     kwlist, &stop_chars, &pycancellable))
-        return NULL;
-
-    if (!pygio_check_cancellable(pycancellable, &cancellable))
-	return NULL;
-
-    line = g_data_input_stream_read_until(G_DATA_INPUT_STREAM(self->obj),
-					  stop_chars, &length, cancellable, &error);
-    if (pyg_error_check(&error))
-        return NULL;
-
-    py_line = PyString_FromStringAndSize(line, length);
-    g_free(line);
-    return py_line;
-}
-%%
 override g_memory_input_stream_add_data kwargs
 static PyObject *
 _wrap_g_memory_input_stream_add_data(PyGObject *self,