mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge typo fixes from 3.5

Browse source
This commit is contained in:
Martin Panter 2016-04-16 09:29:17 +00:00
commit 8b04a945ef
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Modules/_io/bytesio.c
View file

@ -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;

4
Modules/_io/clinic/bytesio.c.h
View file

@ -262,7 +262,7 @@ PyDoc_STRVAR(_io_BytesIO_readinto__doc__,
"Read up to len(buffer) bytes into buffer.\n"
"\n"
"Returns number of bytes read (0 for EOF), or None if the object\n"
"is set not to block as has no data to read.");
"is set not to block and has no data to read.");
#define _IO_BYTESIO_READINTO_METHODDEF \
{"readinto", (PyCFunction)_io_BytesIO_readinto, METH_O, _io_BytesIO_readinto__doc__},
@ -419,4 +419,4 @@ _io_BytesIO___init__(PyObject *self, PyObject *args, PyObject *kwargs)
exit:
return return_value;
}
/*[clinic end generated code: output=500ccc149587fac4 input=a9049054013a1b77]*/
/*[clinic end generated code: output=164cf0e4117dadbe input=a9049054013a1b77]*/