summaryrefslogtreecommitdiffstats
path: root/Modules/_io/bytesio.c
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-04-16 09:29:17 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-04-16 09:29:17 (GMT)
commit8b04a945eff25ee66746d717b060c1b7844808c9 (patch)
tree6a15965fd3f852d9822a98bd04ef01feda33ccb8 /Modules/_io/bytesio.c
parentd3aeb9b797a6a122c27be5649cbc25e26857109b (diff)
parent119e502277d104286620806ef130e3c0d4f439f0 (diff)
downloadcpython-8b04a945eff25ee66746d717b060c1b7844808c9.zip
cpython-8b04a945eff25ee66746d717b060c1b7844808c9.tar.gz
cpython-8b04a945eff25ee66746d717b060c1b7844808c9.tar.bz2
Merge typo fixes from 3.5
Diffstat (limited to 'Modules/_io/bytesio.c')
-rw-r--r--Modules/_io/bytesio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c
index ca3a639..ad96a90 100644
--- a/Modules/_io/bytesio.c
+++ b/Modules/_io/bytesio.c
@@ -549,12 +549,12 @@ _io.BytesIO.readinto
Read up to len(buffer) bytes into buffer.
Returns number of bytes read (0 for EOF), or None if the object
-is set not to block as has no data to read.
+is set not to block and has no data to read.
[clinic start generated code]*/
static PyObject *
_io_BytesIO_readinto_impl(bytesio *self, Py_buffer *buffer)
-/*[clinic end generated code: output=a5d407217dcf0639 input=71581f32635c3a31]*/
+/*[clinic end generated code: output=a5d407217dcf0639 input=b52a8782706f0037]*/
{
Py_ssize_t len, n;