@@ -178,8 +178,10 @@ def write(self, s):
             self.len = newpos
         self.pos = newpos
 
-    def writelines(self, list):
-        self.write(''.join(list))
+    def writelines(self, iterable):
+        write = self.write
+        for line in iterable:
+            write(line)
 
     def flush(self):
         _complain_ifclosed(self.closed)
 
@@ -416,40 +416,35 @@ O_close(Oobject *self, PyObject *unused) {
         return Py_None;
 }
 
-
 PyDoc_STRVAR(O_writelines__doc__,
-"writelines(sequence_of_strings): write each string");
+"writelines(sequence_of_strings) -> None.  Write the strings to the file.\n"
+"\n"
+"Note that newlines are not added.  The sequence can be any iterable object\n"
+"producing strings. This is equivalent to calling write() for each string.");
 static PyObject *
 O_writelines(Oobject *self, PyObject *args) {
-        PyObject *tmp = 0;
-	static PyObject *joiner = NULL;
-
-	if (!joiner) {
-		PyObject *empty_string = PyString_FromString("");
-		if (empty_string == NULL)
+	PyObject *it, *s;
+	
+	it = PyObject_GetIter(args);
+	if (it == NULL)
+		return NULL;
+	while ((s = PyIter_Next(it)) != NULL) {
+		int n;
+		char *c;
+		if (PyString_AsStringAndSize(s, &c, &n) == -1) {
+			Py_DECREF(it);
+			Py_DECREF(s);
 			return NULL;
-		joiner = PyObject_GetAttrString(empty_string, "join");
-		Py_DECREF(empty_string);
-		if (joiner == NULL)
+		}
+		if (O_cwrite((PyObject *)self, c, n) == -1) {
+			Py_DECREF(it);
+			Py_DECREF(s);
 			return NULL;
+		}
+		Py_DECREF(s);
 	}
-
-        if (PyObject_Size(args) < 0) return NULL;
-
-	args = PyTuple_Pack(1, args);
-	if (args == NULL)
-		return NULL;
-	tmp = PyObject_Call(joiner, args, NULL);
-	Py_DECREF(args);
-        UNLESS (tmp) return NULL;
-
-        args = PyTuple_Pack(1, tmp);
-        Py_DECREF(tmp);
-        UNLESS (args) return NULL;
-
-        tmp = O_write(self, args);
-        Py_DECREF(args);
-        return tmp;
+	Py_DECREF(it);
+	Py_RETURN_NONE;
 }
 
 static struct PyMethodDef O_methods[] = {