Add IoOut type to libpyfcgi

include/python_ioin.h

@@ -41,20 +41,26 @@
 #include <limits.h>
 #include <stdlib.h>
 
+typedef int (*write_f)(const char*, size_t);
+
 #define IoIn__FromString(self, str) \
-(((IoIn*)self)->bin?PyBytes_FromString:PyUnicode_FromString)(str)
+(((PyIO_t*)self)->bin?PyBytes_FromString:PyUnicode_FromString)(str)
 
-#define IoIn__FromBuff(self) IoIn__FromString(self, ((IoIn*)self)->buff)
+#define IoIn__FromBuff(self) IoIn__FromString(self, ((PyIO_t*)self)->buff)
 
 extern PyMethodDef IoIn_methods[];
 extern PyMemberDef IoIn_members[];
 extern PyTypeObject IoInType;
 
+extern PyMethodDef IoOut_methods[];
+extern PyMemberDef IoOut_members[];
+extern PyTypeObject IoOutType;
+
 typedef struct
 {
 	PyObject_VAR_HEAD;
 	PyObject *closed;
-	FCGX_Stream **in_stream;
+	FCGX_Stream **io_stream;
 	char *buff;
 	/**@brief buffer size */
 	int buff_sz;
@@ -62,32 +68,52 @@ typedef struct
 	short bin;
 	/**@brief 1 if EOF encountered, else 0 */
 	short eof;
-} IoIn;
 
+	write_f write;
+} PyIO_t;
+
+int pyfcgi_io_init(PyObject *self);
 int pyfcgi_ioin_init(PyObject *self, PyObject *args, PyObject *kwds);
-void pyfcgi_ioin_del(IoIn *self);
+int pyfcgi_ioout_init(PyObject *self, PyObject *args, PyObject *kwds);
+
+void pyfcgi_io_del(PyIO_t *self);
+
+PyObject* pyfcgi_io_close(PyObject *self, PyObject **argv, Py_ssize_t argc);
+PyObject* pyfcgi_io_fileno(PyObject *self, PyObject **argv, Py_ssize_t argc);
+PyObject* pyfcgi_io_flush(PyObject *self, PyObject **argv, Py_ssize_t argc);
+
+PyObject* pyfcgi_io_truncate(PyObject *self, PyObject **argv, Py_ssize_t argc);
+PyObject* pyfcgi_io_seekable(PyObject *self, PyObject **argv, Py_ssize_t argc);
+#define pyfcgi_io_seekable pyfcgi_io_false
+#define pyfcgi_io_isatty pyfcgi_io_false
+
+PyObject* pyfcgi_io_SeekError(PyObject *self, PyObject **argv, Py_ssize_t argc);
+#define pyfcgi_io_seek pyfcgi_io_SeekError
+#define pyfcgi_io_tell pyfcgi_io_SeekError
+
+PyObject* pyfcgi_io_WriteError(PyObject *self, PyObject **argv, Py_ssize_t argc);
+PyObject* pyfcgi_io_ReadError(PyObject *self, PyObject **argv, Py_ssize_t argc);
 
-PyObject* pyfcgi_ioin_close(PyObject *self, PyObject **argv, Py_ssize_t argc);
-PyObject* pyfcgi_ioin_fileno(PyObject *self, PyObject **argv, Py_ssize_t argc);
-PyObject* pyfcgi_ioin_flush(PyObject *self, PyObject **argv, Py_ssize_t argc);
-PyObject* pyfcgi_ioin_isatty(PyObject *self, PyObject **argv, Py_ssize_t argc);
-PyObject* pyfcgi_ioin_readable(PyObject *self, PyObject **argv, Py_ssize_t argc);
+#define pyfcgi_ioin_readable pyfcgi_io_true
 PyObject* pyfcgi_ioin_readline(PyObject *self, PyObject **argv, Py_ssize_t argc);
 PyObject* pyfcgi_ioin_readlines(PyObject *self, PyObject **argv, Py_ssize_t argc);
 PyObject* pyfcgi_ioin_read(PyObject *self, PyObject **argv, Py_ssize_t argc);
 PyObject* pyfcgi_ioin_readall(PyObject *self, PyObject **argv, Py_ssize_t argc);
 PyObject* pyfcgi_ioin_readinto(PyObject *self, PyObject **argv, Py_ssize_t argc);
 
-PyObject* pyfcgi_ioin_WriteError(PyObject *self, PyObject **argv, Py_ssize_t argc);
-#define pyfcgi_ioin_writelines pyfcgi_ioin_WriteError
-#define pyfcgi_ioin_write pyfcgi_ioin_WriteError
+#define pyfcgi_ioin_writable pyfcgi_io_true
+#define pyfcgi_ioin_writelines pyfcgi_io_WriteError
+#define pyfcgi_ioin_write pyfcgi_io_WriteError
 
-PyObject* pyfcgi_ioin_SeekError(PyObject *self, PyObject **argv, Py_ssize_t argc);
-#define pyfcgi_ioin_seek pyfcgi_ioin_SeekError
-#define pyfcgi_ioin_tell pyfcgi_ioin_SeekError
+#define pyfcgi_ioout_readable pyfcgi_io_false
+#define pyfcgi_ioout_readline pyfcgi_io_ReadError
+#define pyfcgi_ioout_readlines pyfcgi_io_ReadError
+#define pyfcgi_ioout_read pyfcgi_io_ReadError
+#define pyfcgi_ioout_readall pyfcgi_io_ReadError
+#define pyfcgi_ioout_readinto pyfcgi_io_ReadError
 
-PyObject* pyfcgi_ioin_truncate(PyObject *self, PyObject **argv, Py_ssize_t argc);
-PyObject* pyfcgi_ioin_seekable(PyObject *self, PyObject **argv, Py_ssize_t argc);
-PyObject* pyfcgi_ioin_writable(PyObject *self, PyObject **argv, Py_ssize_t argc);
+#define pyfcgi_ioout_writable pyfcgi_io_true
+PyObject* pyfcgi_ioout_writelines(PyObject *self, PyObject **argv, Py_ssize_t argc);
+PyObject* pyfcgi_ioout_write(PyObject *self, PyObject **argv, Py_ssize_t argc);
 
 #endif

src/python_ioin.c

@@ -3,7 +3,7 @@
  * @ingroup lib_ioin
  */
 
-/**@brief If given object in_stream is NULL set error indicator
+/**@brief If given object io_stream is NULL set error indicator
  * @return 0 if no error else -1 or -2
  */
 static int _check_nullin(PyObject *self);
@@ -14,24 +14,27 @@ static int _check_nullin(PyObject *self);
  * @param int nreq number of bytes required in buffer
  * @return 0 on error else buffer size
  */
-static int pyfcgi_ioin__reqbuf(PyObject *self, int nreq);
+static int pyfcgi_io__reqbuf(PyObject *self, int nreq);
 
 /**@brief Concat two bytes/unicode given IoIn configuration flag
  */
 static PyObject* IoIn__Concat(PyObject *self, PyObject *left, PyObject *right);
 
+PyObject* pyfcgi_io_true(PyObject *self, PyObject **argv, Py_ssize_t argc);
+PyObject* pyfcgi_io_false(PyObject *self, PyObject **argv, Py_ssize_t argc);
+
 PyMethodDef IoIn_methods[] = {
-	{"close", (PyCFunction)pyfcgi_ioin_close, METH_FASTCALL, NULL},
-	{"fileno", (PyCFunction)pyfcgi_ioin_fileno, METH_FASTCALL, NULL},
-	{"flush", (PyCFunction)pyfcgi_ioin_flush, METH_FASTCALL, NULL},
-	{"isatty", (PyCFunction)pyfcgi_ioin_isatty, METH_FASTCALL, NULL},
+	{"close", (PyCFunction)pyfcgi_io_close, METH_FASTCALL, NULL},
+	{"fileno", (PyCFunction)pyfcgi_io_fileno, METH_FASTCALL, NULL},
+	{"flush", (PyCFunction)pyfcgi_io_flush, METH_FASTCALL, NULL},
+	{"isatty", (PyCFunction)pyfcgi_io_isatty, METH_FASTCALL, NULL},
 	{"readable", (PyCFunction)pyfcgi_ioin_readable, METH_FASTCALL, NULL},
 	{"readline", (PyCFunction)pyfcgi_ioin_readline, METH_FASTCALL, NULL},
 	{"readlines", (PyCFunction)pyfcgi_ioin_readlines, METH_FASTCALL, NULL},
-	{"seek", (PyCFunction)pyfcgi_ioin_seek, METH_FASTCALL, NULL},
-	{"seekable", (PyCFunction)pyfcgi_ioin_seekable, METH_FASTCALL, NULL},
-	{"tell", (PyCFunction)pyfcgi_ioin_tell, METH_FASTCALL, NULL},
-	{"truncate", (PyCFunction)pyfcgi_ioin_truncate, METH_FASTCALL, NULL},
+	{"seek", (PyCFunction)pyfcgi_io_seek, METH_FASTCALL, NULL},
+	{"seekable", (PyCFunction)pyfcgi_io_seekable, METH_FASTCALL, NULL},
+	{"tell", (PyCFunction)pyfcgi_io_tell, METH_FASTCALL, NULL},
+	{"truncate", (PyCFunction)pyfcgi_io_truncate, METH_FASTCALL, NULL},
 	{"writable", (PyCFunction)pyfcgi_ioin_writable, METH_FASTCALL, NULL},
 	{"writelines", (PyCFunction)pyfcgi_ioin_writelines, METH_FASTCALL, NULL},
 	{"read", (PyCFunction)pyfcgi_ioin_read, METH_FASTCALL, NULL},
@@ -42,16 +45,16 @@ PyMethodDef IoIn_methods[] = {
 };
 
 PyMemberDef IoIn_members[] = {
-	{"closed", T_OBJECT, offsetof(IoIn, closed), READONLY, "True if the stream is closed"},
+	{"closed", T_OBJECT, offsetof(PyIO_t, closed), READONLY, "True if the stream is closed"},
 	{NULL}
 };
 
 PyTypeObject IoInType = {
 	PyVarObject_HEAD_INIT(NULL, 0)
 	"libpyfcgi.IoIn",                     /* tp_name */
-	sizeof(IoIn),                        /* tp_basicsize */
+	sizeof(PyIO_t),                        /* tp_basicsize */
 	0,                                               /* tp_itemsize */
-	(destructor)pyfcgi_ioin_del, /* tp_dealloc */
+	(destructor)pyfcgi_io_del, /* tp_dealloc */
 	0,                                               /* tp_print */
 	0,                                               /* tp_getattr */
 	0,                                               /* tp_setattr */
@@ -88,26 +91,108 @@ PyTypeObject IoInType = {
 	0,                            /* tp_new */
 };
 
+PyMethodDef IoOut_methods[] = {
+	{"close", (PyCFunction)pyfcgi_io_close, METH_FASTCALL, NULL},
+	{"fileno", (PyCFunction)pyfcgi_io_fileno, METH_FASTCALL, NULL},
+	{"flush", (PyCFunction)pyfcgi_io_flush, METH_FASTCALL, NULL},
+	{"isatty", (PyCFunction)pyfcgi_io_isatty, METH_FASTCALL, NULL},
+	{"readable", (PyCFunction)pyfcgi_ioout_readable, METH_FASTCALL, NULL},
+	{"readline", (PyCFunction)pyfcgi_ioout_readline, METH_FASTCALL, NULL},
+	{"readlines", (PyCFunction)pyfcgi_ioout_readlines, METH_FASTCALL, NULL},
+	{"seek", (PyCFunction)pyfcgi_io_seek, METH_FASTCALL, NULL},
+	{"seekable", (PyCFunction)pyfcgi_io_seekable, METH_FASTCALL, NULL},
+	{"tell", (PyCFunction)pyfcgi_io_tell, METH_FASTCALL, NULL},
+	{"truncate", (PyCFunction)pyfcgi_io_truncate, METH_FASTCALL, NULL},
+	{"writable", (PyCFunction)pyfcgi_ioout_writable, METH_FASTCALL, NULL},
+	{"writelines", (PyCFunction)pyfcgi_ioout_writelines, METH_FASTCALL, NULL},
+	{"read", (PyCFunction)pyfcgi_ioout_read, METH_FASTCALL, NULL},
+	{"readall", (PyCFunction)pyfcgi_ioout_readall, METH_FASTCALL, NULL},
+	{"readinto", (PyCFunction)pyfcgi_ioout_readinto, METH_FASTCALL, NULL},
+	{"write", (PyCFunction)pyfcgi_ioout_write, METH_FASTCALL, NULL},
+	{NULL} //Sentinel
+};
 
-int pyfcgi_ioin_init(PyObject *self, PyObject *args, PyObject *kwds)
+PyMemberDef IoOut_members[] = {
+	{"closed", T_OBJECT, offsetof(PyIO_t, closed), READONLY, "True if the stream is closed"},
+	{NULL}
+};
+
+PyTypeObject IoOutType = {
+	PyVarObject_HEAD_INIT(NULL, 0)
+	"libpyfcgi.IoOut",                     /* tp_name */
+	sizeof(PyIO_t),                        /* tp_basicsize */
+	0,                                               /* tp_itemsize */
+	(destructor)pyfcgi_io_del, /* tp_dealloc */
+	0,                                               /* tp_print */
+	0,                                               /* tp_getattr */
+	0,                                               /* tp_setattr */
+	0,                                               /* tp_reserved */
+	0,                                               /* tp_repr */
+	0,                                               /* tp_as_number */
+	0,                                               /* tp_as_sequence */
+	0,                              /* tp_as_mapping */
+	0,                                               /* tp_hash  */
+	0,                                               /* tp_call */
+	0,                                               /* tp_str */
+	0,                                               /* tp_getattro */
+	0,                                               /* tp_setattro */
+	0,                                               /* tp_as_buffer */
+	Py_TPFLAGS_DEFAULT |
+	Py_TPFLAGS_BASETYPE,   /* tp_flags */
+	"RawIo interface to FCGI input stream",                /* tp_doc */
+	0,                                               /* tp_traverse */
+	0,                                               /* tp_clear */
+	0,                                               /* tp_richcompare */
+	0,                                               /* tp_weaklistoffset */
+	0,                                               /* tp_iter */
+	0,                                               /* tp_iternext */
+	IoOut_methods,                        /* tp_methods */
+	IoOut_members,                        /* tp_members */
+	0,                                               /* tp_getset */
+	0,                                               /* tp_base */
+	0,                                               /* tp_dict */
+	0,                                               /* tp_descr_get */
+	0,                                               /* tp_descr_set */
+	0,                                               /* tp_dictoffset */
+	pyfcgi_ioout_init,          /* tp_init */
+	0,                                               /* tp_alloc */
+	0,                            /* tp_new */
+};
+
+
+
+int pyfcgi_io_init(PyObject *self)
 {
-	IoIn *ioin = (void*)self;
-	ioin->in_stream = NULL;
+	PyIO_t *ioin = (void*)self;
+	ioin->io_stream = NULL;
 	ioin->buff = NULL;
 	ioin->buff_sz = 0;
 	ioin->eof=0;
 	ioin->bin=1;
+	ioin->write = NULL;
+	return 0;
+}
+
+int pyfcgi_ioin_init(PyObject *self, PyObject *args, PyObject *kwds)
+{
+	pyfcgi_io_init(self);
 	return 0;
 }
 
-void pyfcgi_ioin_del(IoIn *self)
+int pyfcgi_ioout_init(PyObject *self, PyObject *args, PyObject *kwds)
 {
-	IoIn *ioin = self;
+	pyfcgi_io_init(self);
+	return 0;
+}
+
+void pyfcgi_io_del(PyIO_t *self)
+{
+	PyIO_t *ioin = self;
 	if(ioin->buff) { free(ioin->buff); }
 	Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
-PyObject* pyfcgi_ioin_close(PyObject *self, PyObject **argv, Py_ssize_t argc)
+PyObject* pyfcgi_io_close(PyObject *self, PyObject **argv, Py_ssize_t argc)
 {
 	if(_check_nullin(self)) { Py_RETURN_NONE; }
 	if(argc)
@@ -117,22 +202,22 @@ PyObject* pyfcgi_ioin_close(PyObject *self, PyObject **argv, Py_ssize_t argc)
 			argc);
 		Py_RETURN_NONE;
 	}
-	if(FCGX_FClose(*((IoIn*)self)->in_stream) < 0)
+	if(FCGX_FClose(*((PyIO_t*)self)->io_stream) < 0)
 	{
 		PyErr_Format(PyExc_OSError,
 			"%A unable to close", self);
 	}
-	((IoIn*)self)->closed = Py_True;
+	((PyIO_t*)self)->closed = Py_True;
 	Py_RETURN_NONE;
 }
 
-PyObject* pyfcgi_ioin_fileno(PyObject *self, PyObject **argv, Py_ssize_t argc)
+PyObject* pyfcgi_io_fileno(PyObject *self, PyObject **argv, Py_ssize_t argc)
 {
 	PyErr_SetString(PyExc_OSError, "libpyfcgi.IoIn has no fileno");
 	Py_RETURN_NONE;
 }
 
-PyObject* pyfcgi_ioin_flush(PyObject *self, PyObject **argv, Py_ssize_t argc)
+PyObject* pyfcgi_io_flush(PyObject *self, PyObject **argv, Py_ssize_t argc)
 {
 	if(_check_nullin(self)) { Py_RETURN_NONE; }
 	if(argc)
@@ -142,7 +227,7 @@ PyObject* pyfcgi_ioin_flush(PyObject *self, PyObject **argv, Py_ssize_t argc)
 			argc);
 		Py_RETURN_NONE;
 	}
-	if(FCGX_FFlush(*((IoIn*)self)->in_stream) < 0)
+	if(FCGX_FFlush(*((PyIO_t*)self)->io_stream) < 0)
 	{
 		PyErr_Format(PyExc_OSError,
 			"%A unable to flush", self);
@@ -150,16 +235,6 @@ PyObject* pyfcgi_ioin_flush(PyObject *self, PyObject **argv, Py_ssize_t argc)
 	Py_RETURN_NONE;
 }
 
-PyObject* pyfcgi_ioin_isatty(PyObject *self, PyObject **argv, Py_ssize_t argc)
-{
-	return Py_False;
-}
-
-PyObject* pyfcgi_ioin_readable(PyObject *self, PyObject **argv, Py_ssize_t argc)
-{
-	return Py_True;
-}
-
 PyObject* pyfcgi_ioin_readline(PyObject *self, PyObject **argv, Py_ssize_t argc)
 {
 	int read_n;
@@ -176,7 +251,7 @@ PyObject* pyfcgi_ioin_readline(PyObject *self, PyObject **argv, Py_ssize_t argc)
 	}
 	if(!argc || !argv[0])
 	{
-		read_n = pyfcgi_ioin__reqbuf(self, 0);
+		read_n = pyfcgi_io__reqbuf(self, 0);
 	}
 	else
 	{
@@ -185,13 +260,13 @@ PyObject* pyfcgi_ioin_readline(PyObject *self, PyObject **argv, Py_ssize_t argc)
 		{
 			Py_RETURN_NONE;
 		}
-		read_n = pyfcgi_ioin__reqbuf(self, (arg>INT_MAX)?INT_MAX:arg);
+		read_n = pyfcgi_io__reqbuf(self, (arg>INT_MAX)?INT_MAX:arg);
 	}
 
-	ret = ((IoIn*)self)->buff;
-	if(!FCGX_GetLine(ret, read_n, *((IoIn*)self)->in_stream))
+	ret = ((PyIO_t*)self)->buff;
+	if(!FCGX_GetLine(ret, read_n, *((PyIO_t*)self)->io_stream))
 	{
-		((IoIn*)self)->eof = 1;
+		((PyIO_t*)self)->eof = 1;
 		ret = "";
 	}
 //dprintf(2, "readline : '%s'\n", ret);
@@ -236,17 +311,17 @@ PyObject* pyfcgi_ioin_readlines(PyObject *self, PyObject **argv, Py_ssize_t argc
 	}
 	Py_INCREF(res);
 
-	read_n = pyfcgi_ioin__reqbuf(self, 0);
-	buff = ((IoIn*)self)->buff;
+	read_n = pyfcgi_io__reqbuf(self, 0);
+	buff = ((PyIO_t*)self)->buff;
 	cur_str = NULL;
 
 	while((hint && left) || !hint)
 	{
 		toread = (hint&&((size_t)read_n > left))?(int)left:read_n;
 		if(!FCGX_GetLine(buff, toread,
-			*((IoIn*)self)->in_stream))
+			*((PyIO_t*)self)->io_stream))
 		{
-			((IoIn*)self)->eof = 1;
+			((PyIO_t*)self)->eof = 1;
 			break;
 		}
 		sz = strlen(buff);
@@ -311,7 +386,7 @@ PyObject* pyfcgi_ioin_read(PyObject *self, PyObject **argv, Py_ssize_t argc)
 		Py_RETURN_NONE;
 	}
 
-	if(((IoIn*)self)->eof)
+	if(((PyIO_t*)self)->eof)
 	{
 		return IoIn__FromString(self, "");
 	}
@@ -330,8 +405,8 @@ PyObject* pyfcgi_ioin_read(PyObject *self, PyObject **argv, Py_ssize_t argc)
 		}
 	}
 	left = max;
-	read_n = pyfcgi_ioin__reqbuf(self, 0);
-	buff = ((IoIn*)self)->buff;
+	read_n = pyfcgi_io__reqbuf(self, 0);
+	buff = ((PyIO_t*)self)->buff;
 	if(!(res = IoIn__FromString(self, "")))
 	{
 		Py_RETURN_NONE;
@@ -340,7 +415,7 @@ PyObject* pyfcgi_ioin_read(PyObject *self, PyObject **argv, Py_ssize_t argc)
 	while((max && left) || !max)
 	{
 		toread = (max&&((size_t)read_n > left))?(int)left:read_n;
-		sz = FCGX_GetStr(buff, toread, *((IoIn*)self)->in_stream);
+		sz = FCGX_GetStr(buff, toread, *((PyIO_t*)self)->io_stream);
 		if(sz)
 		{
 			if(sz == toread) { buff[sz] = '\0'; }
@@ -359,7 +434,7 @@ PyObject* pyfcgi_ioin_read(PyObject *self, PyObject **argv, Py_ssize_t argc)
 
 		if( sz < toread)
 		{
-			((IoIn*)self)->eof = 1;
+			((PyIO_t*)self)->eof = 1;
 			break;
 		}
 	}
@@ -408,14 +483,14 @@ PyObject* pyfcgi_ioin_readinto(PyObject *self, PyObject **argv, Py_ssize_t argc)
 	left = max = PyByteArray_Size(b);
 	buff = PyByteArray_AsString(b);
 	buff_ptr = buff;
-	read_n = pyfcgi_ioin__reqbuf(self, 0);
+	read_n = pyfcgi_io__reqbuf(self, 0);
 	while(left)
 	{
 		toread = left>read_n?read_n:left;
 		if((ret = FCGX_GetStr(buff_ptr, toread,
-			*((IoIn*)self)->in_stream)) < toread)
+			*((PyIO_t*)self)->io_stream)) < toread)
 		{
-			((IoIn*)self)->eof = 1;
+			((PyIO_t*)self)->eof = 1;
 			break;
 		}
 		buff_ptr += ret;
@@ -427,45 +502,164 @@ PyObject* pyfcgi_ioin_readinto(PyObject *self, PyObject **argv, Py_ssize_t argc)
 	return b;
 }	
 
-
-PyObject* pyfcgi_ioin_truncate(PyObject *self, PyObject **argv, Py_ssize_t argc)
+PyObject* pyfcgi_ioout_writelines(PyObject *self, PyObject **argv, Py_ssize_t argc)
 {
-	PyErr_SetString(PyExc_OSError, "libpyfcgi.IoIn cannot be truncated");
+	PyObject *lines, *iter, *line;
+	const char *bytes;
+	Py_ssize_t bytes_len, lineno;
+	if( ! *((PyIO_t*)self)->write)
+	{
+		PyErr_Format(PyExc_RuntimeError, "%A write function not set",
+			self);
+		Py_RETURN_NONE;
+	}
+	if(argc != 1)
+	{
+		PyErr_Format(PyExc_ValueError,
+			"libpyfcgi.IoOut.writelines() expected 1 argument but %zd given",
+			argc);
+		Py_RETURN_NONE;
+	}
+	lines = argv[0];
+	iter = PyObject_GetIter(lines);
+	if(!iter)
+	{
+		// should drop exception raised by GetIter ??
+		PyErr_Format(PyExc_ValueError,
+			"libpyfcgi.IoOut.writelines() first argument does not support iterator protocol : %A",
+			lines);
+		Py_RETURN_NONE;
+	}
+	lineno = 0;
+	Py_INCREF(iter);
+	while( (line = PyIter_Next(lines)) )
+	{
+		lineno++;
+		Py_INCREF(line);
+		if(PyUnicode_Check(line))
+		{
+			bytes = PyUnicode_AsUTF8AndSize(line, &bytes_len);
+			if(!bytes) { Py_RETURN_NONE; } //forward error
+		}
+		else if(PyBytes_Check(line))
+		{
+			if(PyBytes_AsStringAndSize(line, (char**)&bytes, &bytes_len) == -1)
+			{
+				Py_RETURN_NONE; //forward error
+			}
+		}
+		else
+		{
+			PyErr_Format(PyExc_TypeError,
+				"libpyfcgi.IoOut.writelines() expected argument to be\
+str or bytes but %A given on line %zd",
+				line, lineno);
+			Py_RETURN_NONE;
+		}
+		if( ((PyIO_t*)self)->write(bytes, bytes_len) == -1)
+		{
+			PyErr_Format(PyExc_EOFError,
+				"libpyfcgi.IoOut.writelines() EOF error when writing line %zd",
+				lineno);
+			Py_RETURN_NONE;
+		}
+		Py_DECREF(line);
+	}
+	Py_DECREF(iter);
 	Py_RETURN_NONE;
 }
 
-PyObject* pyfcgi_ioin_SeekError(PyObject *self, PyObject **argv, Py_ssize_t argc)
+PyObject* pyfcgi_ioout_write(PyObject *self, PyObject **argv, Py_ssize_t argc)
 {
-	PyErr_SetString(PyExc_OSError, "libpyfcgi.IoIn is not seekable");
+	PyObject *b;
+	const char *bytes;
+	Py_ssize_t bytes_len;
+	if( ! *((PyIO_t*)self)->write)
+	{
+		PyErr_Format(PyExc_RuntimeError, "%A write function not set",
+			self);
+		Py_RETURN_NONE;
+	}
+	if(argc != 1)
+	{
+		PyErr_Format(PyExc_ValueError,
+			"libpyfcgi.IoOut.writelines() expected 1 argument but %zd given",
+			argc);
+		Py_RETURN_NONE;
+	}
+	b = argv[0];
+	if(PyBytes_Check(b))
+	{
+		if(PyBytes_AsStringAndSize(b, (char**)&bytes, &bytes_len) == -1)
+		{
+			Py_RETURN_NONE; //forward error
+		}
+	}
+	else if(PyUnicode_Check(b))
+	{
+		bytes = PyUnicode_AsUTF8AndSize(b, &bytes_len);
+		if(!bytes) { Py_RETURN_NONE; } //forward error
+	}
+	else
+	{
+		PyErr_Format(PyExc_TypeError,
+			"libpyfcgi.IoOut.write() expected argument to be bytes\
+or str but %A given on line %zd",
+			b);
+		Py_RETURN_NONE;
+	}
+	if( ((PyIO_t*)self)->write(bytes, bytes_len) == -1)
+	{
+		PyErr_Format(PyExc_EOFError,
+			"libpyfcgi.IoOut.writelines() EOF error when calling write");
+		Py_RETURN_NONE;
+	}
 	Py_RETURN_NONE;
 }
 
-PyObject* pyfcgi_ioin_WriteError(PyObject *self, PyObject **argv, Py_ssize_t argc)
+PyObject* pyfcgi_io_false(PyObject *self, PyObject **argv, Py_ssize_t argc)
 {
-	PyErr_SetString(PyExc_OSError, "libpyfcgi.IoIn is not writable");
+	return Py_False;
+}
+
+PyObject* pyfcgi_io_true(PyObject *self, PyObject **argv, Py_ssize_t argc)
+{
+	return Py_True;
+}
+
+PyObject* pyfcgi_io_truncate(PyObject *self, PyObject **argv, Py_ssize_t argc)
+{
+	PyErr_SetString(PyExc_OSError, "libpyfcgi.Io cannot be truncated");
 	Py_RETURN_NONE;
 }
 
-PyObject* pyfcgi_ioin_seekable(PyObject *self, PyObject **argv, Py_ssize_t argc)
+PyObject* pyfcgi_io_SeekError(PyObject *self, PyObject **argv, Py_ssize_t argc)
 {
-	return Py_False;
+	PyErr_SetString(PyExc_OSError, "libpyfcgi.Io is not seekable");
+	Py_RETURN_NONE;
 }
 
-PyObject* pyfcgi_ioin_writable(PyObject *self, PyObject **argv, Py_ssize_t argc)
+PyObject* pyfcgi_io_WriteError(PyObject *self, PyObject **argv, Py_ssize_t argc)
 {
-	return Py_False;
+	PyErr_SetString(PyExc_OSError, "libpyfcgi.IoIn is not writable");
+	Py_RETURN_NONE;
 }
 
+PyObject* pyfcgi_io_ReadError(PyObject *self, PyObject **argv, Py_ssize_t argc)
+{
+	PyErr_SetString(PyExc_OSError, "libpyfcgi.IoOut is not readable");
+	Py_RETURN_NONE;
+}
 
 static int _check_nullin(PyObject *self)
 {
-	if(!((IoIn*)self)->in_stream)
+	if(!((PyIO_t*)self)->io_stream)
 	{
 		PyErr_SetString(PyExc_RuntimeError,
 			"pyfcgi.IoIn called in wrong context : FGCI input not set");
 		return -1;
 	}
-	else if(!(*(((IoIn*)self)->in_stream)))
+	else if(!(*(((PyIO_t*)self)->io_stream)))
 	{
 		PyErr_SetString(PyExc_RuntimeError,
 			"pyfcgi.IoIn called in wrong context : FGCI input is NULL");
@@ -474,13 +668,13 @@ static int _check_nullin(PyObject *self)
 	return 0;
 }
 
-static int pyfcgi_ioin__reqbuf(PyObject *self, int nreq)
+static int pyfcgi_io__reqbuf(PyObject *self, int nreq)
 {
-	IoIn *ioin;
+	PyIO_t *ioin;
 	void *tmp;
 	int err;
 
-	ioin = (IoIn*)self;
+	ioin = (PyIO_t*)self;
 
 	if(ioin->buff_sz > nreq && ioin->buff)
 	{
@@ -508,7 +702,7 @@ static int pyfcgi_ioin__reqbuf(PyObject *self, int nreq)
  */
 static PyObject* IoIn__Concat(PyObject *self, PyObject *left, PyObject *right)
 {
-	if(((IoIn*)self)->bin)
+	if(((PyIO_t*)self)->bin)
 	{
 		PyBytes_Concat(&left, right);
 		Py_DECREF(right);