Commit 858fa689 authored by Martin Panter's avatar Martin Panter

os.sendfile(headers=None, trailers=None) arguments are not actually accepted

Needs to be tested on a BSD.
parent 34c08fad
...@@ -1072,7 +1072,7 @@ or `the MSDN <http://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Window ...@@ -1072,7 +1072,7 @@ or `the MSDN <http://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Window
.. function:: sendfile(out, in, offset, count) .. 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* Copy *count* bytes from file descriptor *in* to file descriptor *out*
starting at *offset*. starting at *offset*.
......
...@@ -2170,7 +2170,7 @@ class TestSendfile(unittest.TestCase): ...@@ -2170,7 +2170,7 @@ class TestSendfile(unittest.TestCase):
**{'in': self.fileno}) **{'in': self.fileno})
if self.SUPPORT_HEADERS_TRAILERS: if self.SUPPORT_HEADERS_TRAILERS:
os.sendfile(self.sockno, self.fileno, offset=0, count=4096, os.sendfile(self.sockno, self.fileno, offset=0, count=4096,
headers=None, trailers=None, flags=0) headers=(), trailers=(), flags=0)
# --- headers / trailers tests # --- headers / trailers tests
......
...@@ -8246,7 +8246,7 @@ posix_write(PyObject *self, PyObject *args) ...@@ -8246,7 +8246,7 @@ posix_write(PyObject *self, PyObject *args)
#ifdef HAVE_SENDFILE #ifdef HAVE_SENDFILE
PyDoc_STRVAR(posix_sendfile__doc__, PyDoc_STRVAR(posix_sendfile__doc__,
"sendfile(out, in, offset, count) -> byteswritten\n\ "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\ -> byteswritten\n\
Copy count bytes from file descriptor in to file descriptor out."); Copy count bytes from file descriptor in to file descriptor out.");
...@@ -8286,7 +8286,7 @@ posix_sendfile(PyObject *self, PyObject *args, PyObject *kwdict) ...@@ -8286,7 +8286,7 @@ posix_sendfile(PyObject *self, PyObject *args, PyObject *kwdict)
if (headers != NULL) { if (headers != NULL) {
if (!PySequence_Check(headers)) { if (!PySequence_Check(headers)) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"sendfile() headers must be a sequence or None"); "sendfile() headers must be a sequence");
return NULL; return NULL;
} else { } else {
Py_ssize_t i = 0; /* Avoid uninitialized warning */ Py_ssize_t i = 0; /* Avoid uninitialized warning */
...@@ -8303,7 +8303,7 @@ posix_sendfile(PyObject *self, PyObject *args, PyObject *kwdict) ...@@ -8303,7 +8303,7 @@ posix_sendfile(PyObject *self, PyObject *args, PyObject *kwdict)
if (trailers != NULL) { if (trailers != NULL) {
if (!PySequence_Check(trailers)) { if (!PySequence_Check(trailers)) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"sendfile() trailers must be a sequence or None"); "sendfile() trailers must be a sequence");
return NULL; return NULL;
} else { } else {
Py_ssize_t i = 0; /* Avoid uninitialized warning */ Py_ssize_t i = 0; /* Avoid uninitialized warning */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment