From: Martin Panter Date: Wed, 9 Sep 2015 01:56:53 +0000 (+0000) Subject: Issue #23738: Merge 3.4 into 3.5 X-Git-Tag: v3.5.1rc1~417 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ff89099c7f1c848c0df3f7f2220b26e08b939da;p=thirdparty%2FPython%2Fcpython.git Issue #23738: Merge 3.4 into 3.5 --- 0ff89099c7f1c848c0df3f7f2220b26e08b939da diff --cc Doc/library/os.rst index d4032e0c2565,7aacd01978f5..25888e493e36 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@@ -1065,16 -1070,11 +1065,16 @@@ or `the MSDN byteswritten\n\ - sendfile(out, in, offset, nbytes, headers=None, trailers=None, flags=0)\n\ + "sendfile(out, in, offset, count) -> byteswritten\n\ + sendfile(out, in, offset, count, headers=None, trailers=None, flags=0)\n\ -> byteswritten\n\ - Copy nbytes bytes from file descriptor in to file descriptor out."); + Copy count bytes from file descriptor in to file descriptor out."); +/* AC 3.5: don't bother converting, has optional group*/ static PyObject * posix_sendfile(PyObject *self, PyObject *args, PyObject *kwdict) {