bpo-38378: Rename parameters "out" and "in" of os.sendfile(). (GH-16742)
They conflicted with keyword "in".
Also rename positional-only parameters of private os._fcopyfile()
for consistency.
diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
index 00b05f7..561cbb0 100644
--- a/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@ -4986,7 +4986,7 @@
#if defined(__APPLE__)
PyDoc_STRVAR(os__fcopyfile__doc__,
-"_fcopyfile($module, infd, outfd, flags, /)\n"
+"_fcopyfile($module, in_fd, out_fd, flags, /)\n"
"--\n"
"\n"
"Efficiently copy content or metadata of 2 regular file descriptors (macOS).");
@@ -4995,14 +4995,14 @@
{"_fcopyfile", (PyCFunction)(void(*)(void))os__fcopyfile, METH_FASTCALL, os__fcopyfile__doc__},
static PyObject *
-os__fcopyfile_impl(PyObject *module, int infd, int outfd, int flags);
+os__fcopyfile_impl(PyObject *module, int in_fd, int out_fd, int flags);
static PyObject *
os__fcopyfile(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
{
PyObject *return_value = NULL;
- int infd;
- int outfd;
+ int in_fd;
+ int out_fd;
int flags;
if (!_PyArg_CheckPositional("_fcopyfile", nargs, 3, 3)) {
@@ -5013,8 +5013,8 @@
"integer argument expected, got float" );
goto exit;
}
- infd = _PyLong_AsInt(args[0]);
- if (infd == -1 && PyErr_Occurred()) {
+ in_fd = _PyLong_AsInt(args[0]);
+ if (in_fd == -1 && PyErr_Occurred()) {
goto exit;
}
if (PyFloat_Check(args[1])) {
@@ -5022,8 +5022,8 @@
"integer argument expected, got float" );
goto exit;
}
- outfd = _PyLong_AsInt(args[1]);
- if (outfd == -1 && PyErr_Occurred()) {
+ out_fd = _PyLong_AsInt(args[1]);
+ if (out_fd == -1 && PyErr_Occurred()) {
goto exit;
}
if (PyFloat_Check(args[2])) {
@@ -5035,7 +5035,7 @@
if (flags == -1 && PyErr_Occurred()) {
goto exit;
}
- return_value = os__fcopyfile_impl(module, infd, outfd, flags);
+ return_value = os__fcopyfile_impl(module, in_fd, out_fd, flags);
exit:
return return_value;
@@ -8731,4 +8731,4 @@
#ifndef OS__REMOVE_DLL_DIRECTORY_METHODDEF
#define OS__REMOVE_DLL_DIRECTORY_METHODDEF
#endif /* !defined(OS__REMOVE_DLL_DIRECTORY_METHODDEF) */
-/*[clinic end generated code: output=799c75140d84ace5 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=fe7897441fed5402 input=a9049054013a1b77]*/
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index aeb0e9d..3c4e254 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -8993,10 +8993,10 @@
#ifdef HAVE_SENDFILE
PyDoc_STRVAR(posix_sendfile__doc__,
-"sendfile(out, in, offset, count) -> byteswritten\n\
-sendfile(out, in, offset, count[, headers][, trailers], flags=0)\n\
+"sendfile(out_fd, in_fd, offset, count) -> byteswritten\n\
+sendfile(out_fd, in_fd, offset, count[, headers][, trailers], flags=0)\n\
-> byteswritten\n\
-Copy count bytes from file descriptor in to file descriptor out.");
+Copy count bytes from file descriptor in_fd to file descriptor out_fd.");
/* AC 3.5: don't bother converting, has optional group*/
static PyObject *
@@ -9016,8 +9016,7 @@
off_t sbytes;
struct sf_hdtr sf;
int flags = 0;
- /* Beware that "in" clashes with Python's own "in" operator keyword */
- static char *keywords[] = {"out", "in",
+ static char *keywords[] = {"out_fd", "in_fd",
"offset", "count",
"headers", "trailers", "flags", NULL};
@@ -9133,7 +9132,7 @@
#else
Py_ssize_t count;
PyObject *offobj;
- static char *keywords[] = {"out", "in",
+ static char *keywords[] = {"out_fd", "in_fd",
"offset", "count", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwdict, "iiOn:sendfile",
keywords, &out, &in, &offobj, &count))
@@ -9170,8 +9169,8 @@
/*[clinic input]
os._fcopyfile
- infd: int
- outfd: int
+ in_fd: int
+ out_fd: int
flags: int
/
@@ -9179,13 +9178,13 @@
[clinic start generated code]*/
static PyObject *
-os__fcopyfile_impl(PyObject *module, int infd, int outfd, int flags)
-/*[clinic end generated code: output=8e8885c721ec38e3 input=69e0770e600cb44f]*/
+os__fcopyfile_impl(PyObject *module, int in_fd, int out_fd, int flags)
+/*[clinic end generated code: output=c9d1a35a992e401b input=1e34638a86948795]*/
{
int ret;
Py_BEGIN_ALLOW_THREADS
- ret = fcopyfile(infd, outfd, NULL, flags);
+ ret = fcopyfile(in_fd, out_fd, NULL, flags);
Py_END_ALLOW_THREADS
if (ret < 0)
return posix_error();