mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge 3.4 into 3.5

Browse source
This commit is contained in:
Martin Panter 2015-09-09 06:27:43 +00:00
commit 6088b7bd49
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/library/os.rst
View file

@ -1072,7 +1072,7 @@ or `the MSDN <http://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Window
.. function:: sendfile(out, in, offset, count)
sendfile(out, in, offset, count, headers=None, trailers=None, flags=0)
sendfile(out, in, offset, count, [headers], [trailers], flags=0)
Copy *count* bytes from file descriptor *in* to file descriptor *out*
starting at *offset*.

2
Lib/test/test_os.py
View file

@ -2332,7 +2332,7 @@ class TestSendfile(unittest.TestCase):
**{'in': self.fileno})
if self.SUPPORT_HEADERS_TRAILERS:
os.sendfile(self.sockno, self.fileno, offset=0, count=4096,
headers=None, trailers=None, flags=0)
headers=(), trailers=(), flags=0)
# --- headers / trailers tests

6
Modules/posixmodule.c
View file

@ -8236,7 +8236,7 @@ os_write_impl(PyModuleDef *module, int fd, Py_buffer *data)
#ifdef HAVE_SENDFILE
PyDoc_STRVAR(posix_sendfile__doc__,
"sendfile(out, in, offset, count) -> byteswritten\n\
sendfile(out, in, offset, count, headers=None, trailers=None, flags=0)\n\
sendfile(out, in, offset, count[, headers][, trailers], flags=0)\n\
-> byteswritten\n\
Copy count bytes from file descriptor in to file descriptor out.");
@ -8278,7 +8278,7 @@ posix_sendfile(PyObject *self, PyObject *args, PyObject *kwdict)
if (headers != NULL) {
if (!PySequence_Check(headers)) {
PyErr_SetString(PyExc_TypeError,
"sendfile() headers must be a sequence or None");
"sendfile() headers must be a sequence");
return NULL;
} else {
Py_ssize_t i = 0; /* Avoid uninitialized warning */
@ -8295,7 +8295,7 @@ posix_sendfile(PyObject *self, PyObject *args, PyObject *kwdict)
if (trailers != NULL) {
if (!PySequence_Check(trailers)) {
PyErr_SetString(PyExc_TypeError,
"sendfile() trailers must be a sequence or None");
"sendfile() trailers must be a sequence");
return NULL;
} else {
Py_ssize_t i = 0; /* Avoid uninitialized warning */