summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2013-05-24 21:36:04 (GMT)
committerBenjamin Peterson <benjamin@python.org>2013-05-24 21:36:04 (GMT)
commite08b583d8828adefa6fba097a5c1405d78dbc759 (patch)
treebe0c2a166b40d869d290dfb55973c01f1383a1ae /Modules
parent6489d0b3808e555509dfb8241fe3eef04d591158 (diff)
parent3b08a2978ec5c555850275dc4fbc15c803d264b2 (diff)
downloadcpython-e08b583d8828adefa6fba097a5c1405d78dbc759.zip
cpython-e08b583d8828adefa6fba097a5c1405d78dbc759.tar.gz
cpython-e08b583d8828adefa6fba097a5c1405d78dbc759.tar.bz2
merge 3.3
Diffstat (limited to 'Modules')
-rw-r--r--Modules/posixmodule.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 615ff82..bedbc1c 100644
--- 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)