merge 3.3

benjaminp · benjaminp · commit e08b583d8828 · 2013-05-24T14:36:04.000-07:00
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -7346,7 +7346,7 @@ posix_lseek(PyObject *self, PyObject *args)
 
 
 PyDoc_STRVAR(posix_read__doc__,
-"read(fd, buffersize) -> string\n\n\
+"read(fd, buffersize) -> bytes\n\n\
 Read a file descriptor.");
 
 static PyObject *
@@ -7516,8 +7516,8 @@ posix_pread(PyObject *self, PyObject *args)
 #endif
 
 PyDoc_STRVAR(posix_write__doc__,
-"write(fd, string) -> byteswritten\n\n\
-Write a string to a file descriptor.");
+"write(fd, data) -> byteswritten\n\n\
+Write bytes to a file descriptor.");
 
 static PyObject *
 posix_write(PyObject *self, PyObject *args)
