bpo-29464: Rename METH_FASTCALL to METH_FASTCALL|METH_KEYWORDS and make (#1955)
the bare METH_FASTCALL be used for functions with positional-only
parameters.
diff --git a/Modules/clinic/_winapi.c.h b/Modules/clinic/_winapi.c.h
index bee75bb..9e1fbe1 100644
--- a/Modules/clinic/_winapi.c.h
+++ b/Modules/clinic/_winapi.c.h
@@ -95,7 +95,7 @@
"\n");
#define _WINAPI_CONNECTNAMEDPIPE_METHODDEF \
- {"ConnectNamedPipe", (PyCFunction)_winapi_ConnectNamedPipe, METH_FASTCALL, _winapi_ConnectNamedPipe__doc__},
+ {"ConnectNamedPipe", (PyCFunction)_winapi_ConnectNamedPipe, METH_FASTCALL|METH_KEYWORDS, _winapi_ConnectNamedPipe__doc__},
static PyObject *
_winapi_ConnectNamedPipe_impl(PyObject *module, HANDLE handle,
@@ -138,7 +138,7 @@
DWORD flags_and_attributes, HANDLE template_file);
static PyObject *
-_winapi_CreateFile(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
+_winapi_CreateFile(PyObject *module, PyObject **args, Py_ssize_t nargs)
{
PyObject *return_value = NULL;
LPCTSTR file_name;
@@ -150,10 +150,6 @@
HANDLE template_file;
HANDLE _return_value;
- if (!_PyArg_NoStackKeywords("CreateFile", kwnames)) {
- goto exit;
- }
-
if (!_PyArg_ParseStack(args, nargs, "skk" F_POINTER "kk" F_HANDLE ":CreateFile",
&file_name, &desired_access, &share_mode, &security_attributes, &creation_disposition, &flags_and_attributes, &template_file)) {
goto exit;
@@ -184,16 +180,12 @@
LPWSTR dst_path);
static PyObject *
-_winapi_CreateJunction(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
+_winapi_CreateJunction(PyObject *module, PyObject **args, Py_ssize_t nargs)
{
PyObject *return_value = NULL;
LPWSTR src_path;
LPWSTR dst_path;
- if (!_PyArg_NoStackKeywords("CreateJunction", kwnames)) {
- goto exit;
- }
-
if (!_PyArg_ParseStack(args, nargs, "uu:CreateJunction",
&src_path, &dst_path)) {
goto exit;
@@ -222,7 +214,7 @@
LPSECURITY_ATTRIBUTES security_attributes);
static PyObject *
-_winapi_CreateNamedPipe(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
+_winapi_CreateNamedPipe(PyObject *module, PyObject **args, Py_ssize_t nargs)
{
PyObject *return_value = NULL;
LPCTSTR name;
@@ -235,10 +227,6 @@
LPSECURITY_ATTRIBUTES security_attributes;
HANDLE _return_value;
- if (!_PyArg_NoStackKeywords("CreateNamedPipe", kwnames)) {
- goto exit;
- }
-
if (!_PyArg_ParseStack(args, nargs, "skkkkkk" F_POINTER ":CreateNamedPipe",
&name, &open_mode, &pipe_mode, &max_instances, &out_buffer_size, &in_buffer_size, &default_timeout, &security_attributes)) {
goto exit;
@@ -274,16 +262,12 @@
_winapi_CreatePipe_impl(PyObject *module, PyObject *pipe_attrs, DWORD size);
static PyObject *
-_winapi_CreatePipe(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
+_winapi_CreatePipe(PyObject *module, PyObject **args, Py_ssize_t nargs)
{
PyObject *return_value = NULL;
PyObject *pipe_attrs;
DWORD size;
- if (!_PyArg_NoStackKeywords("CreatePipe", kwnames)) {
- goto exit;
- }
-
if (!_PyArg_ParseStack(args, nargs, "Ok:CreatePipe",
&pipe_attrs, &size)) {
goto exit;
@@ -322,7 +306,7 @@
PyObject *startup_info);
static PyObject *
-_winapi_CreateProcess(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
+_winapi_CreateProcess(PyObject *module, PyObject **args, Py_ssize_t nargs)
{
PyObject *return_value = NULL;
Py_UNICODE *application_name;
@@ -335,10 +319,6 @@
Py_UNICODE *current_directory;
PyObject *startup_info;
- if (!_PyArg_NoStackKeywords("CreateProcess", kwnames)) {
- goto exit;
- }
-
if (!_PyArg_ParseStack(args, nargs, "ZZOOikOZO:CreateProcess",
&application_name, &command_line, &proc_attrs, &thread_attrs, &inherit_handles, &creation_flags, &env_mapping, ¤t_directory, &startup_info)) {
goto exit;
@@ -372,7 +352,7 @@
DWORD options);
static PyObject *
-_winapi_DuplicateHandle(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
+_winapi_DuplicateHandle(PyObject *module, PyObject **args, Py_ssize_t nargs)
{
PyObject *return_value = NULL;
HANDLE source_process_handle;
@@ -383,10 +363,6 @@
DWORD options = 0;
HANDLE _return_value;
- if (!_PyArg_NoStackKeywords("DuplicateHandle", kwnames)) {
- goto exit;
- }
-
if (!_PyArg_ParseStack(args, nargs, "" F_HANDLE "" F_HANDLE "" F_HANDLE "ki|k:DuplicateHandle",
&source_process_handle, &source_handle, &target_process_handle, &desired_access, &inherit_handle, &options)) {
goto exit;
@@ -635,7 +611,7 @@
BOOL inherit_handle, DWORD process_id);
static PyObject *
-_winapi_OpenProcess(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
+_winapi_OpenProcess(PyObject *module, PyObject **args, Py_ssize_t nargs)
{
PyObject *return_value = NULL;
DWORD desired_access;
@@ -643,10 +619,6 @@
DWORD process_id;
HANDLE _return_value;
- if (!_PyArg_NoStackKeywords("OpenProcess", kwnames)) {
- goto exit;
- }
-
if (!_PyArg_ParseStack(args, nargs, "kik:OpenProcess",
&desired_access, &inherit_handle, &process_id)) {
goto exit;
@@ -676,16 +648,12 @@
_winapi_PeekNamedPipe_impl(PyObject *module, HANDLE handle, int size);
static PyObject *
-_winapi_PeekNamedPipe(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
+_winapi_PeekNamedPipe(PyObject *module, PyObject **args, Py_ssize_t nargs)
{
PyObject *return_value = NULL;
HANDLE handle;
int size = 0;
- if (!_PyArg_NoStackKeywords("PeekNamedPipe", kwnames)) {
- goto exit;
- }
-
if (!_PyArg_ParseStack(args, nargs, "" F_HANDLE "|i:PeekNamedPipe",
&handle, &size)) {
goto exit;
@@ -702,7 +670,7 @@
"\n");
#define _WINAPI_READFILE_METHODDEF \
- {"ReadFile", (PyCFunction)_winapi_ReadFile, METH_FASTCALL, _winapi_ReadFile__doc__},
+ {"ReadFile", (PyCFunction)_winapi_ReadFile, METH_FASTCALL|METH_KEYWORDS, _winapi_ReadFile__doc__},
static PyObject *
_winapi_ReadFile_impl(PyObject *module, HANDLE handle, int size,
@@ -744,7 +712,7 @@
PyObject *collect_data_timeout);
static PyObject *
-_winapi_SetNamedPipeHandleState(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
+_winapi_SetNamedPipeHandleState(PyObject *module, PyObject **args, Py_ssize_t nargs)
{
PyObject *return_value = NULL;
HANDLE named_pipe;
@@ -752,10 +720,6 @@
PyObject *max_collection_count;
PyObject *collect_data_timeout;
- if (!_PyArg_NoStackKeywords("SetNamedPipeHandleState", kwnames)) {
- goto exit;
- }
-
if (!_PyArg_ParseStack(args, nargs, "" F_HANDLE "OOO:SetNamedPipeHandleState",
&named_pipe, &mode, &max_collection_count, &collect_data_timeout)) {
goto exit;
@@ -780,16 +744,12 @@
UINT exit_code);
static PyObject *
-_winapi_TerminateProcess(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
+_winapi_TerminateProcess(PyObject *module, PyObject **args, Py_ssize_t nargs)
{
PyObject *return_value = NULL;
HANDLE handle;
UINT exit_code;
- if (!_PyArg_NoStackKeywords("TerminateProcess", kwnames)) {
- goto exit;
- }
-
if (!_PyArg_ParseStack(args, nargs, "" F_HANDLE "I:TerminateProcess",
&handle, &exit_code)) {
goto exit;
@@ -812,16 +772,12 @@
_winapi_WaitNamedPipe_impl(PyObject *module, LPCTSTR name, DWORD timeout);
static PyObject *
-_winapi_WaitNamedPipe(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
+_winapi_WaitNamedPipe(PyObject *module, PyObject **args, Py_ssize_t nargs)
{
PyObject *return_value = NULL;
LPCTSTR name;
DWORD timeout;
- if (!_PyArg_NoStackKeywords("WaitNamedPipe", kwnames)) {
- goto exit;
- }
-
if (!_PyArg_ParseStack(args, nargs, "sk:WaitNamedPipe",
&name, &timeout)) {
goto exit;
@@ -846,17 +802,13 @@
BOOL wait_flag, DWORD milliseconds);
static PyObject *
-_winapi_WaitForMultipleObjects(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
+_winapi_WaitForMultipleObjects(PyObject *module, PyObject **args, Py_ssize_t nargs)
{
PyObject *return_value = NULL;
PyObject *handle_seq;
BOOL wait_flag;
DWORD milliseconds = INFINITE;
- if (!_PyArg_NoStackKeywords("WaitForMultipleObjects", kwnames)) {
- goto exit;
- }
-
if (!_PyArg_ParseStack(args, nargs, "Oi|k:WaitForMultipleObjects",
&handle_seq, &wait_flag, &milliseconds)) {
goto exit;
@@ -885,17 +837,13 @@
DWORD milliseconds);
static PyObject *
-_winapi_WaitForSingleObject(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
+_winapi_WaitForSingleObject(PyObject *module, PyObject **args, Py_ssize_t nargs)
{
PyObject *return_value = NULL;
HANDLE handle;
DWORD milliseconds;
long _return_value;
- if (!_PyArg_NoStackKeywords("WaitForSingleObject", kwnames)) {
- goto exit;
- }
-
if (!_PyArg_ParseStack(args, nargs, "" F_HANDLE "k:WaitForSingleObject",
&handle, &milliseconds)) {
goto exit;
@@ -916,7 +864,7 @@
"\n");
#define _WINAPI_WRITEFILE_METHODDEF \
- {"WriteFile", (PyCFunction)_winapi_WriteFile, METH_FASTCALL, _winapi_WriteFile__doc__},
+ {"WriteFile", (PyCFunction)_winapi_WriteFile, METH_FASTCALL|METH_KEYWORDS, _winapi_WriteFile__doc__},
static PyObject *
_winapi_WriteFile_impl(PyObject *module, HANDLE handle, PyObject *buffer,
@@ -941,4 +889,4 @@
exit:
return return_value;
}
-/*[clinic end generated code: output=9555c16ed2d95a9f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=afa6bd61eb0f18d2 input=a9049054013a1b77]*/