diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2015-04-09 23:19:57 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-04-09 23:19:57 (GMT) |
commit | 5056769b36901598b9eb3900a44839284e782b14 (patch) | |
tree | 6b2ae6478623bb63e13681cc0cdcbe823ff3faed | |
parent | 4729a5741f25368fc261876f216aa29ec2afbb1a (diff) | |
parent | b817b77a8c4c6c3031c48b2ff95f677e9f1f0b94 (diff) | |
download | cpython-5056769b36901598b9eb3900a44839284e782b14.zip cpython-5056769b36901598b9eb3900a44839284e782b14.tar.gz cpython-5056769b36901598b9eb3900a44839284e782b14.tar.bz2 |
Replaced "string" with "bytes object" in docstrings of binary I/O objects.
-rw-r--r-- | Modules/_io/bytesio.c | 20 | ||||
-rw-r--r-- | Modules/_io/fileio.c | 6 |
2 files changed, 13 insertions, 13 deletions
diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c index fc4ea74..974e33a 100644 --- a/Modules/_io/bytesio.c +++ b/Modules/_io/bytesio.c @@ -325,10 +325,10 @@ read_bytes(bytesio *self, Py_ssize_t size) } PyDoc_STRVAR(read_doc, -"read([size]) -> read at most size bytes, returned as a string.\n" +"read([size]) -> read at most size bytes, returned as a bytes object.\n" "\n" "If the size argument is negative, read until EOF is reached.\n" -"Return an empty string at EOF."); +"Return an empty bytes object at EOF."); static PyObject * bytesio_read(bytesio *self, PyObject *args) @@ -369,10 +369,10 @@ bytesio_read(bytesio *self, PyObject *args) PyDoc_STRVAR(read1_doc, -"read1(size) -> read at most size bytes, returned as a string.\n" +"read1(size) -> read at most size bytes, returned as a bytes object.\n" "\n" "If the size argument is negative or omitted, read until EOF is reached.\n" -"Return an empty string at EOF."); +"Return an empty bytes object at EOF."); static PyObject * bytesio_read1(bytesio *self, PyObject *n) @@ -388,11 +388,11 @@ bytesio_read1(bytesio *self, PyObject *n) } PyDoc_STRVAR(readline_doc, -"readline([size]) -> next line from the file, as a string.\n" +"readline([size]) -> next line from the file, as a bytes object.\n" "\n" "Retain newline. A non-negative size argument limits the maximum\n" "number of bytes to return (an incomplete line may be returned then).\n" -"Return an empty string at EOF.\n"); +"Return an empty bytes object at EOF.\n"); static PyObject * bytesio_readline(bytesio *self, PyObject *args) @@ -672,11 +672,11 @@ bytesio_write(bytesio *self, PyObject *obj) } PyDoc_STRVAR(writelines_doc, -"writelines(sequence_of_strings) -> None. Write strings to the file.\n" +"writelines(lines) -> None. Write bytes objects to the file.\n" "\n" -"Note that newlines are not added. The sequence can be any iterable\n" -"object producing strings. This is equivalent to calling write() for\n" -"each string."); +"Note that newlines are not added. The argument can be any iterable\n" +"object producing bytes objects. This is equivalent to calling write() for\n" +"each bytes object."); static PyObject * bytesio_writelines(bytesio *self, PyObject *v) diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c index b56a9c3..eca8bba 100644 --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -629,7 +629,7 @@ fileio_readall(fileio *self) if (bufsize > PY_SSIZE_T_MAX || bufsize <= 0) { PyErr_SetString(PyExc_OverflowError, "unbounded read returned more bytes " - "than a Python string can hold"); + "than a Python bytes object can hold"); Py_DECREF(result); return NULL; } @@ -1031,13 +1031,13 @@ PyDoc_STRVAR(read_doc, "\n" "Only makes one system call, so less data may be returned than requested\n" "In non-blocking mode, returns None if no data is available.\n" -"On end-of-file, returns ''."); +"Return an empty bytes object at EOF."); PyDoc_STRVAR(readall_doc, "readall() -> bytes. read all data from the file, returned as bytes.\n" "\n" "In non-blocking mode, returns as much as is immediately available,\n" -"or None if no data is available. On end-of-file, returns ''."); +"or None if no data is available. Return an empty bytes object at EOF."); PyDoc_STRVAR(write_doc, "write(b: bytes) -> int. Write bytes b to file, return number written.\n" |