From 9c78780c0443198d6a4a4759409cc33f43303c0c Mon Sep 17 00:00:00 2001 From: ahgamut <41098605+ahgamut@users.noreply.github.com> Date: Fri, 19 Nov 2021 05:18:43 +0530 Subject: [PATCH] add METH_FASTCALL with METH_KEYWORDS not completed; tests are still segfaulting refer python/cpython@6969eaf4682 --- third_party/python/Include/methodobject.h | 6 +- third_party/python/Modules/_elementtree.c | 5 +- .../python/Modules/_io/clinic/_iomodule.inc | 4 +- .../python/Modules/_io/clinic/bufferedio.inc | 32 +- .../python/Modules/_io/clinic/bytesio.inc | 32 +- .../python/Modules/_io/clinic/fileio.inc | 20 +- .../python/Modules/_io/clinic/iobase.inc | 20 +- .../python/Modules/_io/clinic/stringio.inc | 26 +- .../python/Modules/_io/clinic/textio.inc | 28 +- .../Modules/_io/clinic/winconsoleio.inc | 8 +- .../cjkcodecs/clinic/multibytecodec.inc | 28 +- .../python/Modules/clinic/_asynciomodule.inc | 14 +- .../python/Modules/clinic/_bz2module.inc | 4 +- .../python/Modules/clinic/_codecsmodule.inc | 246 +++---------- .../python/Modules/clinic/_cryptmodule.inc | 8 +- .../python/Modules/clinic/_datetimemodule.inc | 4 +- .../python/Modules/clinic/_dbmmodule.inc | 20 +- .../python/Modules/clinic/_elementtree.inc | 50 +-- .../python/Modules/clinic/_gdbmmodule.inc | 20 +- .../python/Modules/clinic/_lzmamodule.inc | 10 +- third_party/python/Modules/clinic/_opcode.inc | 8 +- third_party/python/Modules/clinic/_pickle.inc | 16 +- third_party/python/Modules/clinic/_sre.inc | 56 ++- third_party/python/Modules/clinic/_struct.inc | 18 +- .../python/Modules/clinic/_weakref.inc | 8 +- .../python/Modules/clinic/arraymodule.inc | 26 +- third_party/python/Modules/clinic/audioop.inc | 158 ++------ .../python/Modules/clinic/binascii.inc | 20 +- .../python/Modules/clinic/cmathmodule.inc | 16 +- .../python/Modules/clinic/fcntlmodule.inc | 26 +- .../python/Modules/clinic/grpmodule.inc | 6 +- .../python/Modules/clinic/posixmodule.inc | 338 +++++------------- third_party/python/Modules/clinic/pyexpat.inc | 22 +- .../python/Modules/clinic/signalmodule.inc | 38 +- .../python/Modules/clinic/unicodedata.inc | 32 +- .../python/Modules/clinic/zlibmodule.inc | 36 +- third_party/python/Objects/call.c | 33 +- .../python/Objects/clinic/bytearrayobject.inc | 60 +--- .../python/Objects/clinic/bytesobject.inc | 42 +-- .../python/Objects/clinic/dictobject.inc | 8 +- .../python/Objects/clinic/odictobject.inc | 10 +- .../python/Objects/clinic/unicodeobject.inc | 8 +- third_party/python/Objects/dictobject.c | 15 +- third_party/python/Objects/fileobject.c | 5 +- third_party/python/Objects/floatobject.c | 10 +- third_party/python/Objects/listobject.c | 10 +- third_party/python/Objects/longobject.c | 4 +- third_party/python/Objects/typeobject.c | 2 +- third_party/python/Python/bltinmodule.c | 37 +- .../python/Python/clinic/bltinmodule.inc | 76 +--- third_party/python/Python/clinic/import.inc | 14 +- third_party/python/Python/marshal.c | 12 +- 52 files changed, 449 insertions(+), 1306 deletions(-) diff --git a/third_party/python/Include/methodobject.h b/third_party/python/Include/methodobject.h index 42062832a..25c0c2675 100644 --- a/third_party/python/Include/methodobject.h +++ b/third_party/python/Include/methodobject.h @@ -14,10 +14,12 @@ extern PyTypeObject PyCFunction_Type; #define PyCFunction_Check(op) (Py_TYPE(op) == &PyCFunction_Type) typedef PyObject *(*PyCFunction)(PyObject *, PyObject *); -typedef PyObject *(*_PyCFunctionFast) (PyObject *self, PyObject **args, - Py_ssize_t nargs, PyObject *kwnames); +typedef PyObject *(*_PyCFunctionFast) (PyObject *, PyObject **, Py_ssize_t); typedef PyObject *(*PyCFunctionWithKeywords)(PyObject *, PyObject *, PyObject *); +typedef PyObject *(*_PyCFunctionFastWithKeywords) (PyObject *, + PyObject **, Py_ssize_t, + PyObject *); typedef PyObject *(*PyNoArgsFunction)(PyObject *); PyCFunction PyCFunction_GetFunction(PyObject *); diff --git a/third_party/python/Modules/_elementtree.c b/third_party/python/Modules/_elementtree.c index a66ed801a..6e65678de 100644 --- a/third_party/python/Modules/_elementtree.c +++ b/third_party/python/Modules/_elementtree.c @@ -2806,9 +2806,6 @@ typedef struct { } XMLParserObject; -static PyObject* -_elementtree_XMLParser_doctype(XMLParserObject* self, PyObject** args, - Py_ssize_t nargs, PyObject* kwnames); static PyObject * _elementtree_XMLParser_doctype_impl(XMLParserObject *self, PyObject *name, PyObject *pubid, PyObject *system); @@ -3225,7 +3222,7 @@ expat_start_doctype_handler(XMLParserObject *self, !(PyCFunction_Check(parser_doctype) && PyCFunction_GET_SELF(parser_doctype) == self_pyobj && PyCFunction_GET_FUNCTION(parser_doctype) == - (PyCFunction) _elementtree_XMLParser_doctype)) { + (PyCFunction) _elementtree_XMLParser_doctype_impl)) { res = _elementtree_XMLParser_doctype_impl(self, doctype_name_obj, pubid_obj, sysid_obj); if (!res) diff --git a/third_party/python/Modules/_io/clinic/_iomodule.inc b/third_party/python/Modules/_io/clinic/_iomodule.inc index 00dfa598e..ac0fc9558 100644 --- a/third_party/python/Modules/_io/clinic/_iomodule.inc +++ b/third_party/python/Modules/_io/clinic/_iomodule.inc @@ -128,7 +128,7 @@ PyDoc_STRVAR(_io_open__doc__, "opened in a binary mode."); #define _IO_OPEN_METHODDEF \ - {"open", (PyCFunction)_io_open, METH_FASTCALL, _io_open__doc__}, + {"open", (PyCFunction)_io_open, METH_FASTCALL|METH_KEYWORDS, _io_open__doc__}, static PyObject * _io_open_impl(PyObject *module, PyObject *file, const char *mode, @@ -159,4 +159,4 @@ _io_open(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) exit: return return_value; } -/*[clinic end generated code: output=79fd04d9c9d8f28f input=a9049054013a1b77]*/ +/*[clinic end generated code: output=a748395f9589de02 input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/_io/clinic/bufferedio.inc b/third_party/python/Modules/_io/clinic/bufferedio.inc index 670c28c37..4af7fe87a 100644 --- a/third_party/python/Modules/_io/clinic/bufferedio.inc +++ b/third_party/python/Modules/_io/clinic/bufferedio.inc @@ -98,7 +98,7 @@ static PyObject * _io__Buffered_peek_impl(buffered *self, Py_ssize_t size); static PyObject * -_io__Buffered_peek(buffered *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io__Buffered_peek(buffered *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_ssize_t size = 0; @@ -107,10 +107,6 @@ _io__Buffered_peek(buffered *self, PyObject **args, Py_ssize_t nargs, PyObject * &size)) { goto exit; } - - if (!_PyArg_NoStackKeywords("peek", kwnames)) { - goto exit; - } return_value = _io__Buffered_peek_impl(self, size); exit: @@ -129,7 +125,7 @@ static PyObject * _io__Buffered_read_impl(buffered *self, Py_ssize_t n); static PyObject * -_io__Buffered_read(buffered *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io__Buffered_read(buffered *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_ssize_t n = -1; @@ -138,10 +134,6 @@ _io__Buffered_read(buffered *self, PyObject **args, Py_ssize_t nargs, PyObject * _PyIO_ConvertSsize_t, &n)) { goto exit; } - - if (!_PyArg_NoStackKeywords("read", kwnames)) { - goto exit; - } return_value = _io__Buffered_read_impl(self, n); exit: @@ -248,7 +240,7 @@ static PyObject * _io__Buffered_readline_impl(buffered *self, Py_ssize_t size); static PyObject * -_io__Buffered_readline(buffered *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io__Buffered_readline(buffered *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_ssize_t size = -1; @@ -257,10 +249,6 @@ _io__Buffered_readline(buffered *self, PyObject **args, Py_ssize_t nargs, PyObje _PyIO_ConvertSsize_t, &size)) { goto exit; } - - if (!_PyArg_NoStackKeywords("readline", kwnames)) { - goto exit; - } return_value = _io__Buffered_readline_impl(self, size); exit: @@ -279,7 +267,7 @@ static PyObject * _io__Buffered_seek_impl(buffered *self, PyObject *targetobj, int whence); static PyObject * -_io__Buffered_seek(buffered *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io__Buffered_seek(buffered *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *targetobj; @@ -289,10 +277,6 @@ _io__Buffered_seek(buffered *self, PyObject **args, Py_ssize_t nargs, PyObject * &targetobj, &whence)) { goto exit; } - - if (!_PyArg_NoStackKeywords("seek", kwnames)) { - goto exit; - } return_value = _io__Buffered_seek_impl(self, targetobj, whence); exit: @@ -311,7 +295,7 @@ static PyObject * _io__Buffered_truncate_impl(buffered *self, PyObject *pos); static PyObject * -_io__Buffered_truncate(buffered *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io__Buffered_truncate(buffered *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *pos = Py_None; @@ -321,10 +305,6 @@ _io__Buffered_truncate(buffered *self, PyObject **args, Py_ssize_t nargs, PyObje &pos)) { goto exit; } - - if (!_PyArg_NoStackKeywords("truncate", kwnames)) { - goto exit; - } return_value = _io__Buffered_truncate_impl(self, pos); exit: @@ -496,4 +476,4 @@ _io_BufferedRandom___init__(PyObject *self, PyObject *args, PyObject *kwargs) exit: return return_value; } -/*[clinic end generated code: output=c526190c51a616c8 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=5239e4eaff6306f3 input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/_io/clinic/bytesio.inc b/third_party/python/Modules/_io/clinic/bytesio.inc index f83b30855..97e302a29 100644 --- a/third_party/python/Modules/_io/clinic/bytesio.inc +++ b/third_party/python/Modules/_io/clinic/bytesio.inc @@ -165,7 +165,7 @@ static PyObject * _io_BytesIO_read_impl(bytesio *self, PyObject *arg); static PyObject * -_io_BytesIO_read(bytesio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io_BytesIO_read(bytesio *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *arg = Py_None; @@ -175,10 +175,6 @@ _io_BytesIO_read(bytesio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwn &arg)) { goto exit; } - - if (!_PyArg_NoStackKeywords("read", kwnames)) { - goto exit; - } return_value = _io_BytesIO_read_impl(self, arg); exit: @@ -214,7 +210,7 @@ static PyObject * _io_BytesIO_readline_impl(bytesio *self, PyObject *arg); static PyObject * -_io_BytesIO_readline(bytesio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io_BytesIO_readline(bytesio *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *arg = Py_None; @@ -224,10 +220,6 @@ _io_BytesIO_readline(bytesio *self, PyObject **args, Py_ssize_t nargs, PyObject &arg)) { goto exit; } - - if (!_PyArg_NoStackKeywords("readline", kwnames)) { - goto exit; - } return_value = _io_BytesIO_readline_impl(self, arg); exit: @@ -251,7 +243,7 @@ static PyObject * _io_BytesIO_readlines_impl(bytesio *self, PyObject *arg); static PyObject * -_io_BytesIO_readlines(bytesio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io_BytesIO_readlines(bytesio *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *arg = Py_None; @@ -261,10 +253,6 @@ _io_BytesIO_readlines(bytesio *self, PyObject **args, Py_ssize_t nargs, PyObject &arg)) { goto exit; } - - if (!_PyArg_NoStackKeywords("readlines", kwnames)) { - goto exit; - } return_value = _io_BytesIO_readlines_impl(self, arg); exit: @@ -322,7 +310,7 @@ static PyObject * _io_BytesIO_truncate_impl(bytesio *self, PyObject *arg); static PyObject * -_io_BytesIO_truncate(bytesio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io_BytesIO_truncate(bytesio *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *arg = Py_None; @@ -332,10 +320,6 @@ _io_BytesIO_truncate(bytesio *self, PyObject **args, Py_ssize_t nargs, PyObject &arg)) { goto exit; } - - if (!_PyArg_NoStackKeywords("truncate", kwnames)) { - goto exit; - } return_value = _io_BytesIO_truncate_impl(self, arg); exit: @@ -361,7 +345,7 @@ static PyObject * _io_BytesIO_seek_impl(bytesio *self, Py_ssize_t pos, int whence); static PyObject * -_io_BytesIO_seek(bytesio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io_BytesIO_seek(bytesio *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_ssize_t pos; @@ -371,10 +355,6 @@ _io_BytesIO_seek(bytesio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwn &pos, &whence)) { goto exit; } - - if (!_PyArg_NoStackKeywords("seek", kwnames)) { - goto exit; - } return_value = _io_BytesIO_seek_impl(self, pos, whence); exit: @@ -449,4 +429,4 @@ _io_BytesIO___init__(PyObject *self, PyObject *args, PyObject *kwargs) exit: return return_value; } -/*[clinic end generated code: output=08139186b009ec47 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=c8184aac612e063e input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/_io/clinic/fileio.inc b/third_party/python/Modules/_io/clinic/fileio.inc index 02400ba8b..23c2ccf38 100644 --- a/third_party/python/Modules/_io/clinic/fileio.inc +++ b/third_party/python/Modules/_io/clinic/fileio.inc @@ -209,7 +209,7 @@ static PyObject * _io_FileIO_read_impl(fileio *self, Py_ssize_t size); static PyObject * -_io_FileIO_read(fileio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io_FileIO_read(fileio *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_ssize_t size = -1; @@ -218,10 +218,6 @@ _io_FileIO_read(fileio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnam _PyIO_ConvertSsize_t, &size)) { goto exit; } - - if (!_PyArg_NoStackKeywords("read", kwnames)) { - goto exit; - } return_value = _io_FileIO_read_impl(self, size); exit: @@ -285,7 +281,7 @@ static PyObject * _io_FileIO_seek_impl(fileio *self, PyObject *pos, int whence); static PyObject * -_io_FileIO_seek(fileio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io_FileIO_seek(fileio *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *pos; @@ -295,10 +291,6 @@ _io_FileIO_seek(fileio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnam &pos, &whence)) { goto exit; } - - if (!_PyArg_NoStackKeywords("seek", kwnames)) { - goto exit; - } return_value = _io_FileIO_seek_impl(self, pos, whence); exit: @@ -343,7 +335,7 @@ static PyObject * _io_FileIO_truncate_impl(fileio *self, PyObject *posobj); static PyObject * -_io_FileIO_truncate(fileio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io_FileIO_truncate(fileio *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *posobj = NULL; @@ -353,10 +345,6 @@ _io_FileIO_truncate(fileio *self, PyObject **args, Py_ssize_t nargs, PyObject *k &posobj)) { goto exit; } - - if (!_PyArg_NoStackKeywords("truncate", kwnames)) { - goto exit; - } return_value = _io_FileIO_truncate_impl(self, posobj); exit: @@ -386,4 +374,4 @@ _io_FileIO_isatty(fileio *self, PyObject *Py_UNUSED(ignored)) #ifndef _IO_FILEIO_TRUNCATE_METHODDEF #define _IO_FILEIO_TRUNCATE_METHODDEF #endif /* !defined(_IO_FILEIO_TRUNCATE_METHODDEF) */ -/*[clinic end generated code: output=034d782a0daa82bd input=a9049054013a1b77]*/ +/*[clinic end generated code: output=9d282c5eb1399024 input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/_io/clinic/iobase.inc b/third_party/python/Modules/_io/clinic/iobase.inc index 33c999f08..c175bc9f0 100644 --- a/third_party/python/Modules/_io/clinic/iobase.inc +++ b/third_party/python/Modules/_io/clinic/iobase.inc @@ -181,7 +181,7 @@ static PyObject * _io__IOBase_readline_impl(PyObject *self, Py_ssize_t limit); static PyObject * -_io__IOBase_readline(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io__IOBase_readline(PyObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_ssize_t limit = -1; @@ -190,10 +190,6 @@ _io__IOBase_readline(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject _PyIO_ConvertSsize_t, &limit)) { goto exit; } - - if (!_PyArg_NoStackKeywords("readline", kwnames)) { - goto exit; - } return_value = _io__IOBase_readline_impl(self, limit); exit: @@ -217,7 +213,7 @@ static PyObject * _io__IOBase_readlines_impl(PyObject *self, Py_ssize_t hint); static PyObject * -_io__IOBase_readlines(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io__IOBase_readlines(PyObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_ssize_t hint = -1; @@ -226,10 +222,6 @@ _io__IOBase_readlines(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObjec _PyIO_ConvertSsize_t, &hint)) { goto exit; } - - if (!_PyArg_NoStackKeywords("readlines", kwnames)) { - goto exit; - } return_value = _io__IOBase_readlines_impl(self, hint); exit: @@ -256,7 +248,7 @@ static PyObject * _io__RawIOBase_read_impl(PyObject *self, Py_ssize_t n); static PyObject * -_io__RawIOBase_read(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io__RawIOBase_read(PyObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_ssize_t n = -1; @@ -265,10 +257,6 @@ _io__RawIOBase_read(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject &n)) { goto exit; } - - if (!_PyArg_NoStackKeywords("read", kwnames)) { - goto exit; - } return_value = _io__RawIOBase_read_impl(self, n); exit: @@ -292,4 +280,4 @@ _io__RawIOBase_readall(PyObject *self, PyObject *Py_UNUSED(ignored)) { return _io__RawIOBase_readall_impl(self); } -/*[clinic end generated code: output=1bcece367fc7b0cd input=a9049054013a1b77]*/ +/*[clinic end generated code: output=ec8a2ef87208ce4c input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/_io/clinic/stringio.inc b/third_party/python/Modules/_io/clinic/stringio.inc index 4a3c497fb..59da33c10 100644 --- a/third_party/python/Modules/_io/clinic/stringio.inc +++ b/third_party/python/Modules/_io/clinic/stringio.inc @@ -55,7 +55,7 @@ static PyObject * _io_StringIO_read_impl(stringio *self, PyObject *arg); static PyObject * -_io_StringIO_read(stringio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io_StringIO_read(stringio *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *arg = Py_None; @@ -65,10 +65,6 @@ _io_StringIO_read(stringio *self, PyObject **args, Py_ssize_t nargs, PyObject *k &arg)) { goto exit; } - - if (!_PyArg_NoStackKeywords("read", kwnames)) { - goto exit; - } return_value = _io_StringIO_read_impl(self, arg); exit: @@ -90,7 +86,7 @@ static PyObject * _io_StringIO_readline_impl(stringio *self, PyObject *arg); static PyObject * -_io_StringIO_readline(stringio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io_StringIO_readline(stringio *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *arg = Py_None; @@ -100,10 +96,6 @@ _io_StringIO_readline(stringio *self, PyObject **args, Py_ssize_t nargs, PyObjec &arg)) { goto exit; } - - if (!_PyArg_NoStackKeywords("readline", kwnames)) { - goto exit; - } return_value = _io_StringIO_readline_impl(self, arg); exit: @@ -127,7 +119,7 @@ static PyObject * _io_StringIO_truncate_impl(stringio *self, PyObject *arg); static PyObject * -_io_StringIO_truncate(stringio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io_StringIO_truncate(stringio *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *arg = Py_None; @@ -137,10 +129,6 @@ _io_StringIO_truncate(stringio *self, PyObject **args, Py_ssize_t nargs, PyObjec &arg)) { goto exit; } - - if (!_PyArg_NoStackKeywords("truncate", kwnames)) { - goto exit; - } return_value = _io_StringIO_truncate_impl(self, arg); exit: @@ -166,7 +154,7 @@ static PyObject * _io_StringIO_seek_impl(stringio *self, Py_ssize_t pos, int whence); static PyObject * -_io_StringIO_seek(stringio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io_StringIO_seek(stringio *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_ssize_t pos; @@ -176,10 +164,6 @@ _io_StringIO_seek(stringio *self, PyObject **args, Py_ssize_t nargs, PyObject *k &pos, &whence)) { goto exit; } - - if (!_PyArg_NoStackKeywords("seek", kwnames)) { - goto exit; - } return_value = _io_StringIO_seek_impl(self, pos, whence); exit: @@ -306,4 +290,4 @@ _io_StringIO_seekable(stringio *self, PyObject *Py_UNUSED(ignored)) { return _io_StringIO_seekable_impl(self); } -/*[clinic end generated code: output=ce8018ec29def422 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=d69e0df410070292 input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/_io/clinic/textio.inc b/third_party/python/Modules/_io/clinic/textio.inc index 4f58dd268..0bec38da9 100644 --- a/third_party/python/Modules/_io/clinic/textio.inc +++ b/third_party/python/Modules/_io/clinic/textio.inc @@ -47,7 +47,7 @@ PyDoc_STRVAR(_io_IncrementalNewlineDecoder_decode__doc__, "\n"); #define _IO_INCREMENTALNEWLINEDECODER_DECODE_METHODDEF \ - {"decode", (PyCFunction)_io_IncrementalNewlineDecoder_decode, METH_FASTCALL, _io_IncrementalNewlineDecoder_decode__doc__}, + {"decode", (PyCFunction)_io_IncrementalNewlineDecoder_decode, METH_FASTCALL|METH_KEYWORDS, _io_IncrementalNewlineDecoder_decode__doc__}, static PyObject * _io_IncrementalNewlineDecoder_decode_impl(nldecoder_object *self, @@ -232,7 +232,7 @@ static PyObject * _io_TextIOWrapper_read_impl(textio *self, Py_ssize_t n); static PyObject * -_io_TextIOWrapper_read(textio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io_TextIOWrapper_read(textio *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_ssize_t n = -1; @@ -241,10 +241,6 @@ _io_TextIOWrapper_read(textio *self, PyObject **args, Py_ssize_t nargs, PyObject _PyIO_ConvertSsize_t, &n)) { goto exit; } - - if (!_PyArg_NoStackKeywords("read", kwnames)) { - goto exit; - } return_value = _io_TextIOWrapper_read_impl(self, n); exit: @@ -263,7 +259,7 @@ static PyObject * _io_TextIOWrapper_readline_impl(textio *self, Py_ssize_t size); static PyObject * -_io_TextIOWrapper_readline(textio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io_TextIOWrapper_readline(textio *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_ssize_t size = -1; @@ -272,10 +268,6 @@ _io_TextIOWrapper_readline(textio *self, PyObject **args, Py_ssize_t nargs, PyOb &size)) { goto exit; } - - if (!_PyArg_NoStackKeywords("readline", kwnames)) { - goto exit; - } return_value = _io_TextIOWrapper_readline_impl(self, size); exit: @@ -294,7 +286,7 @@ static PyObject * _io_TextIOWrapper_seek_impl(textio *self, PyObject *cookieObj, int whence); static PyObject * -_io_TextIOWrapper_seek(textio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io_TextIOWrapper_seek(textio *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *cookieObj; @@ -304,10 +296,6 @@ _io_TextIOWrapper_seek(textio *self, PyObject **args, Py_ssize_t nargs, PyObject &cookieObj, &whence)) { goto exit; } - - if (!_PyArg_NoStackKeywords("seek", kwnames)) { - goto exit; - } return_value = _io_TextIOWrapper_seek_impl(self, cookieObj, whence); exit: @@ -343,7 +331,7 @@ static PyObject * _io_TextIOWrapper_truncate_impl(textio *self, PyObject *pos); static PyObject * -_io_TextIOWrapper_truncate(textio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io_TextIOWrapper_truncate(textio *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *pos = Py_None; @@ -353,10 +341,6 @@ _io_TextIOWrapper_truncate(textio *self, PyObject **args, Py_ssize_t nargs, PyOb &pos)) { goto exit; } - - if (!_PyArg_NoStackKeywords("truncate", kwnames)) { - goto exit; - } return_value = _io_TextIOWrapper_truncate_impl(self, pos); exit: @@ -481,4 +465,4 @@ _io_TextIOWrapper_close(textio *self, PyObject *Py_UNUSED(ignored)) { return _io_TextIOWrapper_close_impl(self); } -/*[clinic end generated code: output=67eba50449900a96 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=eee57db91b6b0550 input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/_io/clinic/winconsoleio.inc b/third_party/python/Modules/_io/clinic/winconsoleio.inc index 0cec0141d..3f9502675 100644 --- a/third_party/python/Modules/_io/clinic/winconsoleio.inc +++ b/third_party/python/Modules/_io/clinic/winconsoleio.inc @@ -186,7 +186,7 @@ static PyObject * _io__WindowsConsoleIO_read_impl(winconsoleio *self, Py_ssize_t size); static PyObject * -_io__WindowsConsoleIO_read(winconsoleio *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_io__WindowsConsoleIO_read(winconsoleio *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_ssize_t size = -1; @@ -195,10 +195,6 @@ _io__WindowsConsoleIO_read(winconsoleio *self, PyObject **args, Py_ssize_t nargs _PyIO_ConvertSsize_t, &size)) { goto exit; } - - if (!_PyArg_NoStackKeywords("read", kwnames)) { - goto exit; - } return_value = _io__WindowsConsoleIO_read_impl(self, size); exit: @@ -257,4 +253,4 @@ _io__WindowsConsoleIO_isatty(winconsoleio *self, PyObject *Py_UNUSED(ignored)) { return _io__WindowsConsoleIO_isatty_impl(self); } -/*[clinic end generated code: output=b097ceeb54d6e15e input=a9049054013a1b77]*/ +/*[clinic end generated code: output=178c491c15ee794c input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/cjkcodecs/clinic/multibytecodec.inc b/third_party/python/Modules/cjkcodecs/clinic/multibytecodec.inc index 8ed9fb9b8..16956ad73 100644 --- a/third_party/python/Modules/cjkcodecs/clinic/multibytecodec.inc +++ b/third_party/python/Modules/cjkcodecs/clinic/multibytecodec.inc @@ -15,7 +15,7 @@ PyDoc_STRVAR(_multibytecodec_MultibyteCodec_encode__doc__, "registered with codecs.register_error that can handle UnicodeEncodeErrors."); #define _MULTIBYTECODEC_MULTIBYTECODEC_ENCODE_METHODDEF \ - {"encode", (PyCFunction)_multibytecodec_MultibyteCodec_encode, METH_FASTCALL, _multibytecodec_MultibyteCodec_encode__doc__}, + {"encode", (PyCFunction)_multibytecodec_MultibyteCodec_encode, METH_FASTCALL|METH_KEYWORDS, _multibytecodec_MultibyteCodec_encode__doc__}, static PyObject * _multibytecodec_MultibyteCodec_encode_impl(MultibyteCodecObject *self, @@ -53,7 +53,7 @@ PyDoc_STRVAR(_multibytecodec_MultibyteCodec_decode__doc__, "codecs.register_error that is able to handle UnicodeDecodeErrors.\""); #define _MULTIBYTECODEC_MULTIBYTECODEC_DECODE_METHODDEF \ - {"decode", (PyCFunction)_multibytecodec_MultibyteCodec_decode, METH_FASTCALL, _multibytecodec_MultibyteCodec_decode__doc__}, + {"decode", (PyCFunction)_multibytecodec_MultibyteCodec_decode, METH_FASTCALL|METH_KEYWORDS, _multibytecodec_MultibyteCodec_decode__doc__}, static PyObject * _multibytecodec_MultibyteCodec_decode_impl(MultibyteCodecObject *self, @@ -90,7 +90,7 @@ PyDoc_STRVAR(_multibytecodec_MultibyteIncrementalEncoder_encode__doc__, "\n"); #define _MULTIBYTECODEC_MULTIBYTEINCREMENTALENCODER_ENCODE_METHODDEF \ - {"encode", (PyCFunction)_multibytecodec_MultibyteIncrementalEncoder_encode, METH_FASTCALL, _multibytecodec_MultibyteIncrementalEncoder_encode__doc__}, + {"encode", (PyCFunction)_multibytecodec_MultibyteIncrementalEncoder_encode, METH_FASTCALL|METH_KEYWORDS, _multibytecodec_MultibyteIncrementalEncoder_encode__doc__}, static PyObject * _multibytecodec_MultibyteIncrementalEncoder_encode_impl(MultibyteIncrementalEncoderObject *self, @@ -139,7 +139,7 @@ PyDoc_STRVAR(_multibytecodec_MultibyteIncrementalDecoder_decode__doc__, "\n"); #define _MULTIBYTECODEC_MULTIBYTEINCREMENTALDECODER_DECODE_METHODDEF \ - {"decode", (PyCFunction)_multibytecodec_MultibyteIncrementalDecoder_decode, METH_FASTCALL, _multibytecodec_MultibyteIncrementalDecoder_decode__doc__}, + {"decode", (PyCFunction)_multibytecodec_MultibyteIncrementalDecoder_decode, METH_FASTCALL|METH_KEYWORDS, _multibytecodec_MultibyteIncrementalDecoder_decode__doc__}, static PyObject * _multibytecodec_MultibyteIncrementalDecoder_decode_impl(MultibyteIncrementalDecoderObject *self, @@ -193,19 +193,19 @@ PyDoc_STRVAR(_multibytecodec_MultibyteStreamReader_read__doc__, "\n"); #define _MULTIBYTECODEC_MULTIBYTESTREAMREADER_READ_METHODDEF \ - {"read", (PyCFunction)_multibytecodec_MultibyteStreamReader_read, METH_VARARGS, _multibytecodec_MultibyteStreamReader_read__doc__}, + {"read", (PyCFunction)_multibytecodec_MultibyteStreamReader_read, METH_FASTCALL, _multibytecodec_MultibyteStreamReader_read__doc__}, static PyObject * _multibytecodec_MultibyteStreamReader_read_impl(MultibyteStreamReaderObject *self, PyObject *sizeobj); static PyObject * -_multibytecodec_MultibyteStreamReader_read(MultibyteStreamReaderObject *self, PyObject *args) +_multibytecodec_MultibyteStreamReader_read(MultibyteStreamReaderObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *sizeobj = Py_None; - if (!PyArg_UnpackTuple(args, "read", + if (!_PyArg_UnpackStack(args, nargs, "read", 0, 1, &sizeobj)) { goto exit; @@ -222,19 +222,19 @@ PyDoc_STRVAR(_multibytecodec_MultibyteStreamReader_readline__doc__, "\n"); #define _MULTIBYTECODEC_MULTIBYTESTREAMREADER_READLINE_METHODDEF \ - {"readline", (PyCFunction)_multibytecodec_MultibyteStreamReader_readline, METH_VARARGS, _multibytecodec_MultibyteStreamReader_readline__doc__}, + {"readline", (PyCFunction)_multibytecodec_MultibyteStreamReader_readline, METH_FASTCALL, _multibytecodec_MultibyteStreamReader_readline__doc__}, static PyObject * _multibytecodec_MultibyteStreamReader_readline_impl(MultibyteStreamReaderObject *self, PyObject *sizeobj); static PyObject * -_multibytecodec_MultibyteStreamReader_readline(MultibyteStreamReaderObject *self, PyObject *args) +_multibytecodec_MultibyteStreamReader_readline(MultibyteStreamReaderObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *sizeobj = Py_None; - if (!PyArg_UnpackTuple(args, "readline", + if (!_PyArg_UnpackStack(args, nargs, "readline", 0, 1, &sizeobj)) { goto exit; @@ -251,19 +251,19 @@ PyDoc_STRVAR(_multibytecodec_MultibyteStreamReader_readlines__doc__, "\n"); #define _MULTIBYTECODEC_MULTIBYTESTREAMREADER_READLINES_METHODDEF \ - {"readlines", (PyCFunction)_multibytecodec_MultibyteStreamReader_readlines, METH_VARARGS, _multibytecodec_MultibyteStreamReader_readlines__doc__}, + {"readlines", (PyCFunction)_multibytecodec_MultibyteStreamReader_readlines, METH_FASTCALL, _multibytecodec_MultibyteStreamReader_readlines__doc__}, static PyObject * _multibytecodec_MultibyteStreamReader_readlines_impl(MultibyteStreamReaderObject *self, PyObject *sizehintobj); static PyObject * -_multibytecodec_MultibyteStreamReader_readlines(MultibyteStreamReaderObject *self, PyObject *args) +_multibytecodec_MultibyteStreamReader_readlines(MultibyteStreamReaderObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *sizehintobj = Py_None; - if (!PyArg_UnpackTuple(args, "readlines", + if (!_PyArg_UnpackStack(args, nargs, "readlines", 0, 1, &sizehintobj)) { goto exit; @@ -331,4 +331,4 @@ PyDoc_STRVAR(_multibytecodec___create_codec__doc__, #define _MULTIBYTECODEC___CREATE_CODEC_METHODDEF \ {"__create_codec", (PyCFunction)_multibytecodec___create_codec, METH_O, _multibytecodec___create_codec__doc__}, -/*[clinic end generated code: output=134b9e36cb985939 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=dc2352619de9d74f input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/_asynciomodule.inc b/third_party/python/Modules/clinic/_asynciomodule.inc index 64881d791..0d5d25f56 100644 --- a/third_party/python/Modules/clinic/_asynciomodule.inc +++ b/third_party/python/Modules/clinic/_asynciomodule.inc @@ -268,7 +268,7 @@ PyDoc_STRVAR(_asyncio_Task_current_task__doc__, "None is returned when called not in the context of a Task."); #define _ASYNCIO_TASK_CURRENT_TASK_METHODDEF \ - {"current_task", (PyCFunction)_asyncio_Task_current_task, METH_FASTCALL|METH_CLASS, _asyncio_Task_current_task__doc__}, + {"current_task", (PyCFunction)_asyncio_Task_current_task, METH_FASTCALL|METH_KEYWORDS|METH_CLASS, _asyncio_Task_current_task__doc__}, static PyObject * _asyncio_Task_current_task_impl(PyTypeObject *type, PyObject *loop); @@ -300,7 +300,7 @@ PyDoc_STRVAR(_asyncio_Task_all_tasks__doc__, "By default all tasks for the current event loop are returned."); #define _ASYNCIO_TASK_ALL_TASKS_METHODDEF \ - {"all_tasks", (PyCFunction)_asyncio_Task_all_tasks, METH_FASTCALL|METH_CLASS, _asyncio_Task_all_tasks__doc__}, + {"all_tasks", (PyCFunction)_asyncio_Task_all_tasks, METH_FASTCALL|METH_KEYWORDS|METH_CLASS, _asyncio_Task_all_tasks__doc__}, static PyObject * _asyncio_Task_all_tasks_impl(PyTypeObject *type, PyObject *loop); @@ -400,7 +400,7 @@ PyDoc_STRVAR(_asyncio_Task_get_stack__doc__, "returned for a suspended coroutine."); #define _ASYNCIO_TASK_GET_STACK_METHODDEF \ - {"get_stack", (PyCFunction)_asyncio_Task_get_stack, METH_FASTCALL, _asyncio_Task_get_stack__doc__}, + {"get_stack", (PyCFunction)_asyncio_Task_get_stack, METH_FASTCALL|METH_KEYWORDS, _asyncio_Task_get_stack__doc__}, static PyObject * _asyncio_Task_get_stack_impl(TaskObj *self, PyObject *limit); @@ -436,7 +436,7 @@ PyDoc_STRVAR(_asyncio_Task_print_stack__doc__, "to sys.stderr."); #define _ASYNCIO_TASK_PRINT_STACK_METHODDEF \ - {"print_stack", (PyCFunction)_asyncio_Task_print_stack, METH_FASTCALL, _asyncio_Task_print_stack__doc__}, + {"print_stack", (PyCFunction)_asyncio_Task_print_stack, METH_FASTCALL|METH_KEYWORDS, _asyncio_Task_print_stack__doc__}, static PyObject * _asyncio_Task_print_stack_impl(TaskObj *self, PyObject *limit, @@ -467,7 +467,7 @@ PyDoc_STRVAR(_asyncio_Task__step__doc__, "\n"); #define _ASYNCIO_TASK__STEP_METHODDEF \ - {"_step", (PyCFunction)_asyncio_Task__step, METH_FASTCALL, _asyncio_Task__step__doc__}, + {"_step", (PyCFunction)_asyncio_Task__step, METH_FASTCALL|METH_KEYWORDS, _asyncio_Task__step__doc__}, static PyObject * _asyncio_Task__step_impl(TaskObj *self, PyObject *exc); @@ -496,7 +496,7 @@ PyDoc_STRVAR(_asyncio_Task__wakeup__doc__, "\n"); #define _ASYNCIO_TASK__WAKEUP_METHODDEF \ - {"_wakeup", (PyCFunction)_asyncio_Task__wakeup, METH_FASTCALL, _asyncio_Task__wakeup__doc__}, + {"_wakeup", (PyCFunction)_asyncio_Task__wakeup, METH_FASTCALL|METH_KEYWORDS, _asyncio_Task__wakeup__doc__}, static PyObject * _asyncio_Task__wakeup_impl(TaskObj *self, PyObject *fut); @@ -518,4 +518,4 @@ _asyncio_Task__wakeup(TaskObj *self, PyObject **args, Py_ssize_t nargs, PyObject exit: return return_value; } -/*[clinic end generated code: output=1f2f5bbc35bc3c4e input=a9049054013a1b77]*/ +/*[clinic end generated code: output=b92f9cd2b9fb37ef input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/_bz2module.inc b/third_party/python/Modules/clinic/_bz2module.inc index 06e2d7d6a..954e7b4b0 100644 --- a/third_party/python/Modules/clinic/_bz2module.inc +++ b/third_party/python/Modules/clinic/_bz2module.inc @@ -116,7 +116,7 @@ PyDoc_STRVAR(_bz2_BZ2Decompressor_decompress__doc__, "the unused_data attribute."); #define _BZ2_BZ2DECOMPRESSOR_DECOMPRESS_METHODDEF \ - {"decompress", (PyCFunction)_bz2_BZ2Decompressor_decompress, METH_FASTCALL, _bz2_BZ2Decompressor_decompress__doc__}, + {"decompress", (PyCFunction)_bz2_BZ2Decompressor_decompress, METH_FASTCALL|METH_KEYWORDS, _bz2_BZ2Decompressor_decompress__doc__}, static PyObject * _bz2_BZ2Decompressor_decompress_impl(BZ2Decompressor *self, Py_buffer *data, @@ -175,4 +175,4 @@ _bz2_BZ2Decompressor___init__(PyObject *self, PyObject *args, PyObject *kwargs) exit: return return_value; } -/*[clinic end generated code: output=0e97a1d716b35a14 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=835673574cf12cc4 input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/_codecsmodule.inc b/third_party/python/Modules/clinic/_codecsmodule.inc index 64b1557e0..eeedd6efb 100644 --- a/third_party/python/Modules/clinic/_codecsmodule.inc +++ b/third_party/python/Modules/clinic/_codecsmodule.inc @@ -56,7 +56,7 @@ PyDoc_STRVAR(_codecs_encode__doc__, "codecs.register_error that can handle ValueErrors."); #define _CODECS_ENCODE_METHODDEF \ - {"encode", (PyCFunction)_codecs_encode, METH_FASTCALL, _codecs_encode__doc__}, + {"encode", (PyCFunction)_codecs_encode, METH_FASTCALL|METH_KEYWORDS, _codecs_encode__doc__}, static PyObject * _codecs_encode_impl(PyObject *module, PyObject *obj, const char *encoding, @@ -95,7 +95,7 @@ PyDoc_STRVAR(_codecs_decode__doc__, "codecs.register_error that can handle ValueErrors."); #define _CODECS_DECODE_METHODDEF \ - {"decode", (PyCFunction)_codecs_decode, METH_FASTCALL, _codecs_decode__doc__}, + {"decode", (PyCFunction)_codecs_decode, METH_FASTCALL|METH_KEYWORDS, _codecs_decode__doc__}, static PyObject * _codecs_decode_impl(PyObject *module, PyObject *obj, const char *encoding, @@ -161,7 +161,7 @@ _codecs_escape_decode_impl(PyObject *module, Py_buffer *data, const char *errors); static PyObject * -_codecs_escape_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_escape_decode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -171,10 +171,6 @@ _codecs_escape_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObj &data, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("escape_decode", kwnames)) { - goto exit; - } return_value = _codecs_escape_decode_impl(module, &data, errors); exit: @@ -199,7 +195,7 @@ _codecs_escape_encode_impl(PyObject *module, PyObject *data, const char *errors); static PyObject * -_codecs_escape_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_escape_encode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *data; @@ -209,10 +205,6 @@ _codecs_escape_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObj &PyBytes_Type, &data, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("escape_encode", kwnames)) { - goto exit; - } return_value = _codecs_escape_encode_impl(module, data, errors); exit: @@ -232,7 +224,7 @@ _codecs_unicode_internal_decode_impl(PyObject *module, PyObject *obj, const char *errors); static PyObject * -_codecs_unicode_internal_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_unicode_internal_decode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *obj; @@ -242,10 +234,6 @@ _codecs_unicode_internal_decode(PyObject *module, PyObject **args, Py_ssize_t na &obj, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("unicode_internal_decode", kwnames)) { - goto exit; - } return_value = _codecs_unicode_internal_decode_impl(module, obj, errors); exit: @@ -265,7 +253,7 @@ _codecs_utf_7_decode_impl(PyObject *module, Py_buffer *data, const char *errors, int final); static PyObject * -_codecs_utf_7_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_utf_7_decode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -276,10 +264,6 @@ _codecs_utf_7_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObje &data, &errors, &final)) { goto exit; } - - if (!_PyArg_NoStackKeywords("utf_7_decode", kwnames)) { - goto exit; - } return_value = _codecs_utf_7_decode_impl(module, &data, errors, final); exit: @@ -304,7 +288,7 @@ _codecs_utf_8_decode_impl(PyObject *module, Py_buffer *data, const char *errors, int final); static PyObject * -_codecs_utf_8_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_utf_8_decode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -315,10 +299,6 @@ _codecs_utf_8_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObje &data, &errors, &final)) { goto exit; } - - if (!_PyArg_NoStackKeywords("utf_8_decode", kwnames)) { - goto exit; - } return_value = _codecs_utf_8_decode_impl(module, &data, errors, final); exit: @@ -343,7 +323,7 @@ _codecs_utf_16_decode_impl(PyObject *module, Py_buffer *data, const char *errors, int final); static PyObject * -_codecs_utf_16_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_utf_16_decode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -354,10 +334,6 @@ _codecs_utf_16_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObj &data, &errors, &final)) { goto exit; } - - if (!_PyArg_NoStackKeywords("utf_16_decode", kwnames)) { - goto exit; - } return_value = _codecs_utf_16_decode_impl(module, &data, errors, final); exit: @@ -382,7 +358,7 @@ _codecs_utf_16_le_decode_impl(PyObject *module, Py_buffer *data, const char *errors, int final); static PyObject * -_codecs_utf_16_le_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_utf_16_le_decode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -393,10 +369,6 @@ _codecs_utf_16_le_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, Py &data, &errors, &final)) { goto exit; } - - if (!_PyArg_NoStackKeywords("utf_16_le_decode", kwnames)) { - goto exit; - } return_value = _codecs_utf_16_le_decode_impl(module, &data, errors, final); exit: @@ -421,7 +393,7 @@ _codecs_utf_16_be_decode_impl(PyObject *module, Py_buffer *data, const char *errors, int final); static PyObject * -_codecs_utf_16_be_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_utf_16_be_decode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -432,10 +404,6 @@ _codecs_utf_16_be_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, Py &data, &errors, &final)) { goto exit; } - - if (!_PyArg_NoStackKeywords("utf_16_be_decode", kwnames)) { - goto exit; - } return_value = _codecs_utf_16_be_decode_impl(module, &data, errors, final); exit: @@ -461,7 +429,7 @@ _codecs_utf_16_ex_decode_impl(PyObject *module, Py_buffer *data, const char *errors, int byteorder, int final); static PyObject * -_codecs_utf_16_ex_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_utf_16_ex_decode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -473,10 +441,6 @@ _codecs_utf_16_ex_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, Py &data, &errors, &byteorder, &final)) { goto exit; } - - if (!_PyArg_NoStackKeywords("utf_16_ex_decode", kwnames)) { - goto exit; - } return_value = _codecs_utf_16_ex_decode_impl(module, &data, errors, byteorder, final); exit: @@ -501,7 +465,7 @@ _codecs_utf_32_decode_impl(PyObject *module, Py_buffer *data, const char *errors, int final); static PyObject * -_codecs_utf_32_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_utf_32_decode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -512,10 +476,6 @@ _codecs_utf_32_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObj &data, &errors, &final)) { goto exit; } - - if (!_PyArg_NoStackKeywords("utf_32_decode", kwnames)) { - goto exit; - } return_value = _codecs_utf_32_decode_impl(module, &data, errors, final); exit: @@ -540,7 +500,7 @@ _codecs_utf_32_le_decode_impl(PyObject *module, Py_buffer *data, const char *errors, int final); static PyObject * -_codecs_utf_32_le_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_utf_32_le_decode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -551,10 +511,6 @@ _codecs_utf_32_le_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, Py &data, &errors, &final)) { goto exit; } - - if (!_PyArg_NoStackKeywords("utf_32_le_decode", kwnames)) { - goto exit; - } return_value = _codecs_utf_32_le_decode_impl(module, &data, errors, final); exit: @@ -579,7 +535,7 @@ _codecs_utf_32_be_decode_impl(PyObject *module, Py_buffer *data, const char *errors, int final); static PyObject * -_codecs_utf_32_be_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_utf_32_be_decode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -590,10 +546,6 @@ _codecs_utf_32_be_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, Py &data, &errors, &final)) { goto exit; } - - if (!_PyArg_NoStackKeywords("utf_32_be_decode", kwnames)) { - goto exit; - } return_value = _codecs_utf_32_be_decode_impl(module, &data, errors, final); exit: @@ -619,7 +571,7 @@ _codecs_utf_32_ex_decode_impl(PyObject *module, Py_buffer *data, const char *errors, int byteorder, int final); static PyObject * -_codecs_utf_32_ex_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_utf_32_ex_decode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -631,10 +583,6 @@ _codecs_utf_32_ex_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, Py &data, &errors, &byteorder, &final)) { goto exit; } - - if (!_PyArg_NoStackKeywords("utf_32_ex_decode", kwnames)) { - goto exit; - } return_value = _codecs_utf_32_ex_decode_impl(module, &data, errors, byteorder, final); exit: @@ -659,7 +607,7 @@ _codecs_unicode_escape_decode_impl(PyObject *module, Py_buffer *data, const char *errors); static PyObject * -_codecs_unicode_escape_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_unicode_escape_decode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -669,10 +617,6 @@ _codecs_unicode_escape_decode(PyObject *module, PyObject **args, Py_ssize_t narg &data, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("unicode_escape_decode", kwnames)) { - goto exit; - } return_value = _codecs_unicode_escape_decode_impl(module, &data, errors); exit: @@ -697,7 +641,7 @@ _codecs_raw_unicode_escape_decode_impl(PyObject *module, Py_buffer *data, const char *errors); static PyObject * -_codecs_raw_unicode_escape_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_raw_unicode_escape_decode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -707,10 +651,6 @@ _codecs_raw_unicode_escape_decode(PyObject *module, PyObject **args, Py_ssize_t &data, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("raw_unicode_escape_decode", kwnames)) { - goto exit; - } return_value = _codecs_raw_unicode_escape_decode_impl(module, &data, errors); exit: @@ -735,7 +675,7 @@ _codecs_latin_1_decode_impl(PyObject *module, Py_buffer *data, const char *errors); static PyObject * -_codecs_latin_1_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_latin_1_decode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -745,10 +685,6 @@ _codecs_latin_1_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyOb &data, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("latin_1_decode", kwnames)) { - goto exit; - } return_value = _codecs_latin_1_decode_impl(module, &data, errors); exit: @@ -773,7 +709,7 @@ _codecs_ascii_decode_impl(PyObject *module, Py_buffer *data, const char *errors); static PyObject * -_codecs_ascii_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_ascii_decode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -783,10 +719,6 @@ _codecs_ascii_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObje &data, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("ascii_decode", kwnames)) { - goto exit; - } return_value = _codecs_ascii_decode_impl(module, &data, errors); exit: @@ -811,7 +743,7 @@ _codecs_charmap_decode_impl(PyObject *module, Py_buffer *data, const char *errors, PyObject *mapping); static PyObject * -_codecs_charmap_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_charmap_decode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -822,10 +754,6 @@ _codecs_charmap_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyOb &data, &errors, &mapping)) { goto exit; } - - if (!_PyArg_NoStackKeywords("charmap_decode", kwnames)) { - goto exit; - } return_value = _codecs_charmap_decode_impl(module, &data, errors, mapping); exit: @@ -852,7 +780,7 @@ _codecs_mbcs_decode_impl(PyObject *module, Py_buffer *data, const char *errors, int final); static PyObject * -_codecs_mbcs_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_mbcs_decode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -863,10 +791,6 @@ _codecs_mbcs_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObjec &data, &errors, &final)) { goto exit; } - - if (!_PyArg_NoStackKeywords("mbcs_decode", kwnames)) { - goto exit; - } return_value = _codecs_mbcs_decode_impl(module, &data, errors, final); exit: @@ -895,7 +819,7 @@ _codecs_oem_decode_impl(PyObject *module, Py_buffer *data, const char *errors, int final); static PyObject * -_codecs_oem_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_oem_decode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -906,10 +830,6 @@ _codecs_oem_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject &data, &errors, &final)) { goto exit; } - - if (!_PyArg_NoStackKeywords("oem_decode", kwnames)) { - goto exit; - } return_value = _codecs_oem_decode_impl(module, &data, errors, final); exit: @@ -938,7 +858,7 @@ _codecs_code_page_decode_impl(PyObject *module, int codepage, Py_buffer *data, const char *errors, int final); static PyObject * -_codecs_code_page_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_code_page_decode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int codepage; @@ -950,10 +870,6 @@ _codecs_code_page_decode(PyObject *module, PyObject **args, Py_ssize_t nargs, Py &codepage, &data, &errors, &final)) { goto exit; } - - if (!_PyArg_NoStackKeywords("code_page_decode", kwnames)) { - goto exit; - } return_value = _codecs_code_page_decode_impl(module, codepage, &data, errors, final); exit: @@ -980,7 +896,7 @@ _codecs_readbuffer_encode_impl(PyObject *module, Py_buffer *data, const char *errors); static PyObject * -_codecs_readbuffer_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_readbuffer_encode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -990,10 +906,6 @@ _codecs_readbuffer_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, P &data, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("readbuffer_encode", kwnames)) { - goto exit; - } return_value = _codecs_readbuffer_encode_impl(module, &data, errors); exit: @@ -1018,7 +930,7 @@ _codecs_unicode_internal_encode_impl(PyObject *module, PyObject *obj, const char *errors); static PyObject * -_codecs_unicode_internal_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_unicode_internal_encode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *obj; @@ -1028,10 +940,6 @@ _codecs_unicode_internal_encode(PyObject *module, PyObject **args, Py_ssize_t na &obj, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("unicode_internal_encode", kwnames)) { - goto exit; - } return_value = _codecs_unicode_internal_encode_impl(module, obj, errors); exit: @@ -1051,7 +959,7 @@ _codecs_utf_7_encode_impl(PyObject *module, PyObject *str, const char *errors); static PyObject * -_codecs_utf_7_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_utf_7_encode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *str; @@ -1061,10 +969,6 @@ _codecs_utf_7_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObje &str, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("utf_7_encode", kwnames)) { - goto exit; - } return_value = _codecs_utf_7_encode_impl(module, str, errors); exit: @@ -1084,7 +988,7 @@ _codecs_utf_8_encode_impl(PyObject *module, PyObject *str, const char *errors); static PyObject * -_codecs_utf_8_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_utf_8_encode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *str; @@ -1094,10 +998,6 @@ _codecs_utf_8_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObje &str, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("utf_8_encode", kwnames)) { - goto exit; - } return_value = _codecs_utf_8_encode_impl(module, str, errors); exit: @@ -1117,7 +1017,7 @@ _codecs_utf_16_encode_impl(PyObject *module, PyObject *str, const char *errors, int byteorder); static PyObject * -_codecs_utf_16_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_utf_16_encode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *str; @@ -1128,10 +1028,6 @@ _codecs_utf_16_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObj &str, &errors, &byteorder)) { goto exit; } - - if (!_PyArg_NoStackKeywords("utf_16_encode", kwnames)) { - goto exit; - } return_value = _codecs_utf_16_encode_impl(module, str, errors, byteorder); exit: @@ -1151,7 +1047,7 @@ _codecs_utf_16_le_encode_impl(PyObject *module, PyObject *str, const char *errors); static PyObject * -_codecs_utf_16_le_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_utf_16_le_encode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *str; @@ -1161,10 +1057,6 @@ _codecs_utf_16_le_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, Py &str, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("utf_16_le_encode", kwnames)) { - goto exit; - } return_value = _codecs_utf_16_le_encode_impl(module, str, errors); exit: @@ -1184,7 +1076,7 @@ _codecs_utf_16_be_encode_impl(PyObject *module, PyObject *str, const char *errors); static PyObject * -_codecs_utf_16_be_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_utf_16_be_encode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *str; @@ -1194,10 +1086,6 @@ _codecs_utf_16_be_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, Py &str, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("utf_16_be_encode", kwnames)) { - goto exit; - } return_value = _codecs_utf_16_be_encode_impl(module, str, errors); exit: @@ -1217,7 +1105,7 @@ _codecs_utf_32_encode_impl(PyObject *module, PyObject *str, const char *errors, int byteorder); static PyObject * -_codecs_utf_32_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_utf_32_encode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *str; @@ -1228,10 +1116,6 @@ _codecs_utf_32_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObj &str, &errors, &byteorder)) { goto exit; } - - if (!_PyArg_NoStackKeywords("utf_32_encode", kwnames)) { - goto exit; - } return_value = _codecs_utf_32_encode_impl(module, str, errors, byteorder); exit: @@ -1251,7 +1135,7 @@ _codecs_utf_32_le_encode_impl(PyObject *module, PyObject *str, const char *errors); static PyObject * -_codecs_utf_32_le_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_utf_32_le_encode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *str; @@ -1261,10 +1145,6 @@ _codecs_utf_32_le_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, Py &str, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("utf_32_le_encode", kwnames)) { - goto exit; - } return_value = _codecs_utf_32_le_encode_impl(module, str, errors); exit: @@ -1284,7 +1164,7 @@ _codecs_utf_32_be_encode_impl(PyObject *module, PyObject *str, const char *errors); static PyObject * -_codecs_utf_32_be_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_utf_32_be_encode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *str; @@ -1294,10 +1174,6 @@ _codecs_utf_32_be_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, Py &str, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("utf_32_be_encode", kwnames)) { - goto exit; - } return_value = _codecs_utf_32_be_encode_impl(module, str, errors); exit: @@ -1317,7 +1193,7 @@ _codecs_unicode_escape_encode_impl(PyObject *module, PyObject *str, const char *errors); static PyObject * -_codecs_unicode_escape_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_unicode_escape_encode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *str; @@ -1327,10 +1203,6 @@ _codecs_unicode_escape_encode(PyObject *module, PyObject **args, Py_ssize_t narg &str, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("unicode_escape_encode", kwnames)) { - goto exit; - } return_value = _codecs_unicode_escape_encode_impl(module, str, errors); exit: @@ -1350,7 +1222,7 @@ _codecs_raw_unicode_escape_encode_impl(PyObject *module, PyObject *str, const char *errors); static PyObject * -_codecs_raw_unicode_escape_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_raw_unicode_escape_encode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *str; @@ -1360,10 +1232,6 @@ _codecs_raw_unicode_escape_encode(PyObject *module, PyObject **args, Py_ssize_t &str, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("raw_unicode_escape_encode", kwnames)) { - goto exit; - } return_value = _codecs_raw_unicode_escape_encode_impl(module, str, errors); exit: @@ -1383,7 +1251,7 @@ _codecs_latin_1_encode_impl(PyObject *module, PyObject *str, const char *errors); static PyObject * -_codecs_latin_1_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_latin_1_encode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *str; @@ -1393,10 +1261,6 @@ _codecs_latin_1_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyOb &str, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("latin_1_encode", kwnames)) { - goto exit; - } return_value = _codecs_latin_1_encode_impl(module, str, errors); exit: @@ -1416,7 +1280,7 @@ _codecs_ascii_encode_impl(PyObject *module, PyObject *str, const char *errors); static PyObject * -_codecs_ascii_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_ascii_encode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *str; @@ -1426,10 +1290,6 @@ _codecs_ascii_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObje &str, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("ascii_encode", kwnames)) { - goto exit; - } return_value = _codecs_ascii_encode_impl(module, str, errors); exit: @@ -1449,7 +1309,7 @@ _codecs_charmap_encode_impl(PyObject *module, PyObject *str, const char *errors, PyObject *mapping); static PyObject * -_codecs_charmap_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_charmap_encode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *str; @@ -1460,10 +1320,6 @@ _codecs_charmap_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyOb &str, &errors, &mapping)) { goto exit; } - - if (!_PyArg_NoStackKeywords("charmap_encode", kwnames)) { - goto exit; - } return_value = _codecs_charmap_encode_impl(module, str, errors, mapping); exit: @@ -1510,7 +1366,7 @@ static PyObject * _codecs_mbcs_encode_impl(PyObject *module, PyObject *str, const char *errors); static PyObject * -_codecs_mbcs_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_mbcs_encode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *str; @@ -1520,10 +1376,6 @@ _codecs_mbcs_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObjec &str, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("mbcs_encode", kwnames)) { - goto exit; - } return_value = _codecs_mbcs_encode_impl(module, str, errors); exit: @@ -1546,7 +1398,7 @@ static PyObject * _codecs_oem_encode_impl(PyObject *module, PyObject *str, const char *errors); static PyObject * -_codecs_oem_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_oem_encode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *str; @@ -1556,10 +1408,6 @@ _codecs_oem_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject &str, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("oem_encode", kwnames)) { - goto exit; - } return_value = _codecs_oem_encode_impl(module, str, errors); exit: @@ -1583,7 +1431,7 @@ _codecs_code_page_encode_impl(PyObject *module, int code_page, PyObject *str, const char *errors); static PyObject * -_codecs_code_page_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_code_page_encode(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int code_page; @@ -1594,10 +1442,6 @@ _codecs_code_page_encode(PyObject *module, PyObject **args, Py_ssize_t nargs, Py &code_page, &str, &errors)) { goto exit; } - - if (!_PyArg_NoStackKeywords("code_page_encode", kwnames)) { - goto exit; - } return_value = _codecs_code_page_encode_impl(module, code_page, str, errors); exit: @@ -1624,7 +1468,7 @@ _codecs_register_error_impl(PyObject *module, const char *errors, PyObject *handler); static PyObject * -_codecs_register_error(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_codecs_register_error(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; const char *errors; @@ -1634,10 +1478,6 @@ _codecs_register_error(PyObject *module, PyObject **args, Py_ssize_t nargs, PyOb &errors, &handler)) { goto exit; } - - if (!_PyArg_NoStackKeywords("register_error", kwnames)) { - goto exit; - } return_value = _codecs_register_error_impl(module, errors, handler); exit: @@ -1697,4 +1537,4 @@ exit: #ifndef _CODECS_CODE_PAGE_ENCODE_METHODDEF #define _CODECS_CODE_PAGE_ENCODE_METHODDEF #endif /* !defined(_CODECS_CODE_PAGE_ENCODE_METHODDEF) */ -/*[clinic end generated code: output=36fb42f450a3b4dc input=a9049054013a1b77]*/ +/*[clinic end generated code: output=894910ed4900eeae input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/_cryptmodule.inc b/third_party/python/Modules/clinic/_cryptmodule.inc index f78dfb46a..e150bbe8f 100644 --- a/third_party/python/Modules/clinic/_cryptmodule.inc +++ b/third_party/python/Modules/clinic/_cryptmodule.inc @@ -21,7 +21,7 @@ static PyObject * crypt_crypt_impl(PyObject *module, const char *word, const char *salt); static PyObject * -crypt_crypt(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +crypt_crypt(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; const char *word; @@ -31,13 +31,9 @@ crypt_crypt(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnam &word, &salt)) { goto exit; } - - if (!_PyArg_NoStackKeywords("crypt", kwnames)) { - goto exit; - } return_value = crypt_crypt_impl(module, word, salt); exit: return return_value; } -/*[clinic end generated code: output=3fd5d3625a6f32fe input=a9049054013a1b77]*/ +/*[clinic end generated code: output=f5a6aff28d43154f input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/_datetimemodule.inc b/third_party/python/Modules/clinic/_datetimemodule.inc index bd77e1c76..95c37c5a4 100644 --- a/third_party/python/Modules/clinic/_datetimemodule.inc +++ b/third_party/python/Modules/clinic/_datetimemodule.inc @@ -15,7 +15,7 @@ PyDoc_STRVAR(datetime_datetime_now__doc__, "If no tz is specified, uses local timezone."); #define DATETIME_DATETIME_NOW_METHODDEF \ - {"now", (PyCFunction)datetime_datetime_now, METH_FASTCALL|METH_CLASS, datetime_datetime_now__doc__}, + {"now", (PyCFunction)datetime_datetime_now, METH_FASTCALL|METH_KEYWORDS|METH_CLASS, datetime_datetime_now__doc__}, static PyObject * datetime_datetime_now_impl(PyTypeObject *type, PyObject *tz); @@ -37,4 +37,4 @@ datetime_datetime_now(PyTypeObject *type, PyObject **args, Py_ssize_t nargs, PyO exit: return return_value; } -/*[clinic end generated code: output=ff78f2f51687e9a9 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=93cb014e47dae4b3 input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/_dbmmodule.inc b/third_party/python/Modules/clinic/_dbmmodule.inc index 6a0667de6..21fa6e5f9 100644 --- a/third_party/python/Modules/clinic/_dbmmodule.inc +++ b/third_party/python/Modules/clinic/_dbmmodule.inc @@ -53,7 +53,7 @@ _dbm_dbm_get_impl(dbmobject *self, const char *key, Py_ssize_clean_t key_length, PyObject *default_value); static PyObject * -_dbm_dbm_get(dbmobject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_dbm_dbm_get(dbmobject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; const char *key; @@ -64,10 +64,6 @@ _dbm_dbm_get(dbmobject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnam &key, &key_length, &default_value)) { goto exit; } - - if (!_PyArg_NoStackKeywords("get", kwnames)) { - goto exit; - } return_value = _dbm_dbm_get_impl(self, key, key_length, default_value); exit: @@ -91,7 +87,7 @@ _dbm_dbm_setdefault_impl(dbmobject *self, const char *key, PyObject *default_value); static PyObject * -_dbm_dbm_setdefault(dbmobject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_dbm_dbm_setdefault(dbmobject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; const char *key; @@ -102,10 +98,6 @@ _dbm_dbm_setdefault(dbmobject *self, PyObject **args, Py_ssize_t nargs, PyObject &key, &key_length, &default_value)) { goto exit; } - - if (!_PyArg_NoStackKeywords("setdefault", kwnames)) { - goto exit; - } return_value = _dbm_dbm_setdefault_impl(self, key, key_length, default_value); exit: @@ -134,7 +126,7 @@ dbmopen_impl(PyObject *module, PyObject *filename, const char *flags, int mode); static PyObject * -dbmopen(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +dbmopen(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *filename; @@ -145,13 +137,9 @@ dbmopen(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) &filename, &flags, &mode)) { goto exit; } - - if (!_PyArg_NoStackKeywords("open", kwnames)) { - goto exit; - } return_value = dbmopen_impl(module, filename, flags, mode); exit: return return_value; } -/*[clinic end generated code: output=60482e924110a70a input=a9049054013a1b77]*/ +/*[clinic end generated code: output=fa1f129675b8e7e5 input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/_elementtree.inc b/third_party/python/Modules/clinic/_elementtree.inc index a62afe338..2728bcce7 100644 --- a/third_party/python/Modules/clinic/_elementtree.inc +++ b/third_party/python/Modules/clinic/_elementtree.inc @@ -137,7 +137,7 @@ PyDoc_STRVAR(_elementtree_Element_find__doc__, "\n"); #define _ELEMENTTREE_ELEMENT_FIND_METHODDEF \ - {"find", (PyCFunction)_elementtree_Element_find, METH_FASTCALL, _elementtree_Element_find__doc__}, + {"find", (PyCFunction)_elementtree_Element_find, METH_FASTCALL|METH_KEYWORDS, _elementtree_Element_find__doc__}, static PyObject * _elementtree_Element_find_impl(ElementObject *self, PyObject *path, @@ -168,7 +168,7 @@ PyDoc_STRVAR(_elementtree_Element_findtext__doc__, "\n"); #define _ELEMENTTREE_ELEMENT_FINDTEXT_METHODDEF \ - {"findtext", (PyCFunction)_elementtree_Element_findtext, METH_FASTCALL, _elementtree_Element_findtext__doc__}, + {"findtext", (PyCFunction)_elementtree_Element_findtext, METH_FASTCALL|METH_KEYWORDS, _elementtree_Element_findtext__doc__}, static PyObject * _elementtree_Element_findtext_impl(ElementObject *self, PyObject *path, @@ -201,7 +201,7 @@ PyDoc_STRVAR(_elementtree_Element_findall__doc__, "\n"); #define _ELEMENTTREE_ELEMENT_FINDALL_METHODDEF \ - {"findall", (PyCFunction)_elementtree_Element_findall, METH_FASTCALL, _elementtree_Element_findall__doc__}, + {"findall", (PyCFunction)_elementtree_Element_findall, METH_FASTCALL|METH_KEYWORDS, _elementtree_Element_findall__doc__}, static PyObject * _elementtree_Element_findall_impl(ElementObject *self, PyObject *path, @@ -232,7 +232,7 @@ PyDoc_STRVAR(_elementtree_Element_iterfind__doc__, "\n"); #define _ELEMENTTREE_ELEMENT_ITERFIND_METHODDEF \ - {"iterfind", (PyCFunction)_elementtree_Element_iterfind, METH_FASTCALL, _elementtree_Element_iterfind__doc__}, + {"iterfind", (PyCFunction)_elementtree_Element_iterfind, METH_FASTCALL|METH_KEYWORDS, _elementtree_Element_iterfind__doc__}, static PyObject * _elementtree_Element_iterfind_impl(ElementObject *self, PyObject *path, @@ -263,7 +263,7 @@ PyDoc_STRVAR(_elementtree_Element_get__doc__, "\n"); #define _ELEMENTTREE_ELEMENT_GET_METHODDEF \ - {"get", (PyCFunction)_elementtree_Element_get, METH_FASTCALL, _elementtree_Element_get__doc__}, + {"get", (PyCFunction)_elementtree_Element_get, METH_FASTCALL|METH_KEYWORDS, _elementtree_Element_get__doc__}, static PyObject * _elementtree_Element_get_impl(ElementObject *self, PyObject *key, @@ -311,7 +311,7 @@ PyDoc_STRVAR(_elementtree_Element_iter__doc__, "\n"); #define _ELEMENTTREE_ELEMENT_ITER_METHODDEF \ - {"iter", (PyCFunction)_elementtree_Element_iter, METH_FASTCALL, _elementtree_Element_iter__doc__}, + {"iter", (PyCFunction)_elementtree_Element_iter, METH_FASTCALL|METH_KEYWORDS, _elementtree_Element_iter__doc__}, static PyObject * _elementtree_Element_iter_impl(ElementObject *self, PyObject *tag); @@ -364,7 +364,7 @@ _elementtree_Element_insert_impl(ElementObject *self, Py_ssize_t index, PyObject *subelement); static PyObject * -_elementtree_Element_insert(ElementObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_elementtree_Element_insert(ElementObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_ssize_t index; @@ -374,10 +374,6 @@ _elementtree_Element_insert(ElementObject *self, PyObject **args, Py_ssize_t nar &index, &Element_Type, &subelement)) { goto exit; } - - if (!_PyArg_NoStackKeywords("insert", kwnames)) { - goto exit; - } return_value = _elementtree_Element_insert_impl(self, index, subelement); exit: @@ -431,7 +427,7 @@ _elementtree_Element_makeelement_impl(ElementObject *self, PyObject *tag, PyObject *attrib); static PyObject * -_elementtree_Element_makeelement(ElementObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_elementtree_Element_makeelement(ElementObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *tag; @@ -442,10 +438,6 @@ _elementtree_Element_makeelement(ElementObject *self, PyObject **args, Py_ssize_ &tag, &attrib)) { goto exit; } - - if (!_PyArg_NoStackKeywords("makeelement", kwnames)) { - goto exit; - } return_value = _elementtree_Element_makeelement_impl(self, tag, attrib); exit: @@ -491,7 +483,7 @@ _elementtree_Element_set_impl(ElementObject *self, PyObject *key, PyObject *value); static PyObject * -_elementtree_Element_set(ElementObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_elementtree_Element_set(ElementObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *key; @@ -502,10 +494,6 @@ _elementtree_Element_set(ElementObject *self, PyObject **args, Py_ssize_t nargs, &key, &value)) { goto exit; } - - if (!_PyArg_NoStackKeywords("set", kwnames)) { - goto exit; - } return_value = _elementtree_Element_set_impl(self, key, value); exit: @@ -580,7 +568,7 @@ _elementtree_TreeBuilder_start_impl(TreeBuilderObject *self, PyObject *tag, PyObject *attrs); static PyObject * -_elementtree_TreeBuilder_start(TreeBuilderObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_elementtree_TreeBuilder_start(TreeBuilderObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *tag; @@ -591,10 +579,6 @@ _elementtree_TreeBuilder_start(TreeBuilderObject *self, PyObject **args, Py_ssiz &tag, &attrs)) { goto exit; } - - if (!_PyArg_NoStackKeywords("start", kwnames)) { - goto exit; - } return_value = _elementtree_TreeBuilder_start_impl(self, tag, attrs); exit: @@ -671,7 +655,7 @@ _elementtree_XMLParser_doctype_impl(XMLParserObject *self, PyObject *name, PyObject *pubid, PyObject *system); static PyObject * -_elementtree_XMLParser_doctype(XMLParserObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_elementtree_XMLParser_doctype(XMLParserObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *name; @@ -683,10 +667,6 @@ _elementtree_XMLParser_doctype(XMLParserObject *self, PyObject **args, Py_ssize_ &name, &pubid, &system)) { goto exit; } - - if (!_PyArg_NoStackKeywords("doctype", kwnames)) { - goto exit; - } return_value = _elementtree_XMLParser_doctype_impl(self, name, pubid, system); exit: @@ -707,7 +687,7 @@ _elementtree_XMLParser__setevents_impl(XMLParserObject *self, PyObject *events_to_report); static PyObject * -_elementtree_XMLParser__setevents(XMLParserObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_elementtree_XMLParser__setevents(XMLParserObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *events_queue; @@ -718,13 +698,9 @@ _elementtree_XMLParser__setevents(XMLParserObject *self, PyObject **args, Py_ssi &events_queue, &events_to_report)) { goto exit; } - - if (!_PyArg_NoStackKeywords("_setevents", kwnames)) { - goto exit; - } return_value = _elementtree_XMLParser__setevents_impl(self, events_queue, events_to_report); exit: return return_value; } -/*[clinic end generated code: output=b69fa98c40917f58 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=834a6b1d4032cea2 input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/_gdbmmodule.inc b/third_party/python/Modules/clinic/_gdbmmodule.inc index 985ea3fce..d9ee3fe99 100644 --- a/third_party/python/Modules/clinic/_gdbmmodule.inc +++ b/third_party/python/Modules/clinic/_gdbmmodule.inc @@ -16,7 +16,7 @@ static PyObject * _gdbm_gdbm_get_impl(dbmobject *self, PyObject *key, PyObject *default_value); static PyObject * -_gdbm_gdbm_get(dbmobject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_gdbm_gdbm_get(dbmobject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *key; @@ -27,10 +27,6 @@ _gdbm_gdbm_get(dbmobject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwn &key, &default_value)) { goto exit; } - - if (!_PyArg_NoStackKeywords("get", kwnames)) { - goto exit; - } return_value = _gdbm_gdbm_get_impl(self, key, default_value); exit: @@ -51,7 +47,7 @@ _gdbm_gdbm_setdefault_impl(dbmobject *self, PyObject *key, PyObject *default_value); static PyObject * -_gdbm_gdbm_setdefault(dbmobject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_gdbm_gdbm_setdefault(dbmobject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *key; @@ -62,10 +58,6 @@ _gdbm_gdbm_setdefault(dbmobject *self, PyObject **args, Py_ssize_t nargs, PyObje &key, &default_value)) { goto exit; } - - if (!_PyArg_NoStackKeywords("setdefault", kwnames)) { - goto exit; - } return_value = _gdbm_gdbm_setdefault_impl(self, key, default_value); exit: @@ -247,7 +239,7 @@ dbmopen_impl(PyObject *module, PyObject *filename, const char *flags, int mode); static PyObject * -dbmopen(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +dbmopen(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *filename; @@ -258,13 +250,9 @@ dbmopen(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) &filename, &flags, &mode)) { goto exit; } - - if (!_PyArg_NoStackKeywords("open", kwnames)) { - goto exit; - } return_value = dbmopen_impl(module, filename, flags, mode); exit: return return_value; } -/*[clinic end generated code: output=d12de247acddccc3 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=275c7f70ce0a9d2f input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/_lzmamodule.inc b/third_party/python/Modules/clinic/_lzmamodule.inc index 64d4ce133..5b0e7bcc3 100644 --- a/third_party/python/Modules/clinic/_lzmamodule.inc +++ b/third_party/python/Modules/clinic/_lzmamodule.inc @@ -82,7 +82,7 @@ PyDoc_STRVAR(_lzma_LZMADecompressor_decompress__doc__, "the unused_data attribute."); #define _LZMA_LZMADECOMPRESSOR_DECOMPRESS_METHODDEF \ - {"decompress", (PyCFunction)_lzma_LZMADecompressor_decompress, METH_FASTCALL, _lzma_LZMADecompressor_decompress__doc__}, + {"decompress", (PyCFunction)_lzma_LZMADecompressor_decompress, METH_FASTCALL|METH_KEYWORDS, _lzma_LZMADecompressor_decompress__doc__}, static PyObject * _lzma_LZMADecompressor_decompress_impl(Decompressor *self, Py_buffer *data, @@ -237,7 +237,7 @@ _lzma__decode_filter_properties_impl(PyObject *module, lzma_vli filter_id, Py_buffer *encoded_props); static PyObject * -_lzma__decode_filter_properties(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_lzma__decode_filter_properties(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; lzma_vli filter_id; @@ -247,10 +247,6 @@ _lzma__decode_filter_properties(PyObject *module, PyObject **args, Py_ssize_t na lzma_vli_converter, &filter_id, &encoded_props)) { goto exit; } - - if (!_PyArg_NoStackKeywords("_decode_filter_properties", kwnames)) { - goto exit; - } return_value = _lzma__decode_filter_properties_impl(module, filter_id, &encoded_props); exit: @@ -261,4 +257,4 @@ exit: return return_value; } -/*[clinic end generated code: output=5f7a915fb7e41453 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=d4e3802d0dea9af3 input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/_opcode.inc b/third_party/python/Modules/clinic/_opcode.inc index e95a190fe..4ea7811dd 100644 --- a/third_party/python/Modules/clinic/_opcode.inc +++ b/third_party/python/Modules/clinic/_opcode.inc @@ -16,7 +16,7 @@ static int _opcode_stack_effect_impl(PyObject *module, int opcode, PyObject *oparg); static PyObject * -_opcode_stack_effect(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_opcode_stack_effect(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int opcode; @@ -27,10 +27,6 @@ _opcode_stack_effect(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObje &opcode, &oparg)) { goto exit; } - - if (!_PyArg_NoStackKeywords("stack_effect", kwnames)) { - goto exit; - } _return_value = _opcode_stack_effect_impl(module, opcode, oparg); if ((_return_value == -1) && PyErr_Occurred()) { goto exit; @@ -40,4 +36,4 @@ _opcode_stack_effect(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObje exit: return return_value; } -/*[clinic end generated code: output=62858005ac85baa9 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=616105b05b55eb45 input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/_pickle.inc b/third_party/python/Modules/clinic/_pickle.inc index 376cc540f..a6005a62c 100644 --- a/third_party/python/Modules/clinic/_pickle.inc +++ b/third_party/python/Modules/clinic/_pickle.inc @@ -208,7 +208,7 @@ _pickle_Unpickler_find_class_impl(UnpicklerObject *self, PyObject *global_name); static PyObject * -_pickle_Unpickler_find_class(UnpicklerObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_pickle_Unpickler_find_class(UnpicklerObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *module_name; @@ -219,10 +219,6 @@ _pickle_Unpickler_find_class(UnpicklerObject *self, PyObject **args, Py_ssize_t &module_name, &global_name)) { goto exit; } - - if (!_PyArg_NoStackKeywords("find_class", kwnames)) { - goto exit; - } return_value = _pickle_Unpickler_find_class_impl(self, module_name, global_name); exit: @@ -389,7 +385,7 @@ PyDoc_STRVAR(_pickle_dump__doc__, "2, so that the pickle data stream is readable with Python 2."); #define _PICKLE_DUMP_METHODDEF \ - {"dump", (PyCFunction)_pickle_dump, METH_FASTCALL, _pickle_dump__doc__}, + {"dump", (PyCFunction)_pickle_dump, METH_FASTCALL|METH_KEYWORDS, _pickle_dump__doc__}, static PyObject * _pickle_dump_impl(PyObject *module, PyObject *obj, PyObject *file, @@ -435,7 +431,7 @@ PyDoc_STRVAR(_pickle_dumps__doc__, "Python 2, so that the pickle data stream is readable with Python 2."); #define _PICKLE_DUMPS_METHODDEF \ - {"dumps", (PyCFunction)_pickle_dumps, METH_FASTCALL, _pickle_dumps__doc__}, + {"dumps", (PyCFunction)_pickle_dumps, METH_FASTCALL|METH_KEYWORDS, _pickle_dumps__doc__}, static PyObject * _pickle_dumps_impl(PyObject *module, PyObject *obj, PyObject *protocol, @@ -491,7 +487,7 @@ PyDoc_STRVAR(_pickle_load__doc__, "string instances as bytes objects."); #define _PICKLE_LOAD_METHODDEF \ - {"load", (PyCFunction)_pickle_load, METH_FASTCALL, _pickle_load__doc__}, + {"load", (PyCFunction)_pickle_load, METH_FASTCALL|METH_KEYWORDS, _pickle_load__doc__}, static PyObject * _pickle_load_impl(PyObject *module, PyObject *file, int fix_imports, @@ -539,7 +535,7 @@ PyDoc_STRVAR(_pickle_loads__doc__, "string instances as bytes objects."); #define _PICKLE_LOADS_METHODDEF \ - {"loads", (PyCFunction)_pickle_loads, METH_FASTCALL, _pickle_loads__doc__}, + {"loads", (PyCFunction)_pickle_loads, METH_FASTCALL|METH_KEYWORDS, _pickle_loads__doc__}, static PyObject * _pickle_loads_impl(PyObject *module, PyObject *data, int fix_imports, @@ -565,4 +561,4 @@ _pickle_loads(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwn exit: return return_value; } -/*[clinic end generated code: output=b921d325b2f7a096 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=a6243aaa6ea98732 input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/_sre.inc b/third_party/python/Modules/clinic/_sre.inc index b3c6e95d9..3c4033785 100644 --- a/third_party/python/Modules/clinic/_sre.inc +++ b/third_party/python/Modules/clinic/_sre.inc @@ -42,7 +42,7 @@ static int _sre_getlower_impl(PyObject *module, int character, int flags); static PyObject * -_sre_getlower(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_sre_getlower(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int character; @@ -53,10 +53,6 @@ _sre_getlower(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwn &character, &flags)) { goto exit; } - - if (!_PyArg_NoStackKeywords("getlower", kwnames)) { - goto exit; - } _return_value = _sre_getlower_impl(module, character, flags); if ((_return_value == -1) && PyErr_Occurred()) { goto exit; @@ -74,7 +70,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_match__doc__, "Matches zero or more characters at the beginning of the string."); #define _SRE_SRE_PATTERN_MATCH_METHODDEF \ - {"match", (PyCFunction)_sre_SRE_Pattern_match, METH_FASTCALL, _sre_SRE_Pattern_match__doc__}, + {"match", (PyCFunction)_sre_SRE_Pattern_match, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern_match__doc__}, static PyObject * _sre_SRE_Pattern_match_impl(PatternObject *self, PyObject *string, @@ -110,7 +106,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_fullmatch__doc__, "Matches against all of the string"); #define _SRE_SRE_PATTERN_FULLMATCH_METHODDEF \ - {"fullmatch", (PyCFunction)_sre_SRE_Pattern_fullmatch, METH_FASTCALL, _sre_SRE_Pattern_fullmatch__doc__}, + {"fullmatch", (PyCFunction)_sre_SRE_Pattern_fullmatch, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern_fullmatch__doc__}, static PyObject * _sre_SRE_Pattern_fullmatch_impl(PatternObject *self, PyObject *string, @@ -148,7 +144,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_search__doc__, "Return None if no position in the string matches."); #define _SRE_SRE_PATTERN_SEARCH_METHODDEF \ - {"search", (PyCFunction)_sre_SRE_Pattern_search, METH_FASTCALL, _sre_SRE_Pattern_search__doc__}, + {"search", (PyCFunction)_sre_SRE_Pattern_search, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern_search__doc__}, static PyObject * _sre_SRE_Pattern_search_impl(PatternObject *self, PyObject *string, @@ -184,7 +180,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_findall__doc__, "Return a list of all non-overlapping matches of pattern in string."); #define _SRE_SRE_PATTERN_FINDALL_METHODDEF \ - {"findall", (PyCFunction)_sre_SRE_Pattern_findall, METH_FASTCALL, _sre_SRE_Pattern_findall__doc__}, + {"findall", (PyCFunction)_sre_SRE_Pattern_findall, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern_findall__doc__}, static PyObject * _sre_SRE_Pattern_findall_impl(PatternObject *self, PyObject *string, @@ -221,7 +217,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_finditer__doc__, "For each match, the iterator returns a match object."); #define _SRE_SRE_PATTERN_FINDITER_METHODDEF \ - {"finditer", (PyCFunction)_sre_SRE_Pattern_finditer, METH_FASTCALL, _sre_SRE_Pattern_finditer__doc__}, + {"finditer", (PyCFunction)_sre_SRE_Pattern_finditer, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern_finditer__doc__}, static PyObject * _sre_SRE_Pattern_finditer_impl(PatternObject *self, PyObject *string, @@ -253,7 +249,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_scanner__doc__, "\n"); #define _SRE_SRE_PATTERN_SCANNER_METHODDEF \ - {"scanner", (PyCFunction)_sre_SRE_Pattern_scanner, METH_FASTCALL, _sre_SRE_Pattern_scanner__doc__}, + {"scanner", (PyCFunction)_sre_SRE_Pattern_scanner, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern_scanner__doc__}, static PyObject * _sre_SRE_Pattern_scanner_impl(PatternObject *self, PyObject *string, @@ -286,7 +282,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_split__doc__, "Split string by the occurrences of pattern."); #define _SRE_SRE_PATTERN_SPLIT_METHODDEF \ - {"split", (PyCFunction)_sre_SRE_Pattern_split, METH_FASTCALL, _sre_SRE_Pattern_split__doc__}, + {"split", (PyCFunction)_sre_SRE_Pattern_split, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern_split__doc__}, static PyObject * _sre_SRE_Pattern_split_impl(PatternObject *self, PyObject *string, @@ -319,7 +315,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_sub__doc__, "Return the string obtained by replacing the leftmost non-overlapping occurrences of pattern in string by the replacement repl."); #define _SRE_SRE_PATTERN_SUB_METHODDEF \ - {"sub", (PyCFunction)_sre_SRE_Pattern_sub, METH_FASTCALL, _sre_SRE_Pattern_sub__doc__}, + {"sub", (PyCFunction)_sre_SRE_Pattern_sub, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern_sub__doc__}, static PyObject * _sre_SRE_Pattern_sub_impl(PatternObject *self, PyObject *repl, @@ -352,7 +348,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern_subn__doc__, "Return the tuple (new_string, number_of_subs_made) found by replacing the leftmost non-overlapping occurrences of pattern with the replacement repl."); #define _SRE_SRE_PATTERN_SUBN_METHODDEF \ - {"subn", (PyCFunction)_sre_SRE_Pattern_subn, METH_FASTCALL, _sre_SRE_Pattern_subn__doc__}, + {"subn", (PyCFunction)_sre_SRE_Pattern_subn, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern_subn__doc__}, static PyObject * _sre_SRE_Pattern_subn_impl(PatternObject *self, PyObject *repl, @@ -401,7 +397,7 @@ PyDoc_STRVAR(_sre_SRE_Pattern___deepcopy____doc__, "\n"); #define _SRE_SRE_PATTERN___DEEPCOPY___METHODDEF \ - {"__deepcopy__", (PyCFunction)_sre_SRE_Pattern___deepcopy__, METH_FASTCALL, _sre_SRE_Pattern___deepcopy____doc__}, + {"__deepcopy__", (PyCFunction)_sre_SRE_Pattern___deepcopy__, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Pattern___deepcopy____doc__}, static PyObject * _sre_SRE_Pattern___deepcopy___impl(PatternObject *self, PyObject *memo); @@ -431,7 +427,7 @@ PyDoc_STRVAR(_sre_compile__doc__, "\n"); #define _SRE_COMPILE_METHODDEF \ - {"compile", (PyCFunction)_sre_compile, METH_FASTCALL, _sre_compile__doc__}, + {"compile", (PyCFunction)_sre_compile, METH_FASTCALL|METH_KEYWORDS, _sre_compile__doc__}, static PyObject * _sre_compile_impl(PyObject *module, PyObject *pattern, int flags, @@ -468,7 +464,7 @@ PyDoc_STRVAR(_sre_SRE_Match_expand__doc__, "Return the string obtained by doing backslash substitution on the string template, as done by the sub() method."); #define _SRE_SRE_MATCH_EXPAND_METHODDEF \ - {"expand", (PyCFunction)_sre_SRE_Match_expand, METH_FASTCALL, _sre_SRE_Match_expand__doc__}, + {"expand", (PyCFunction)_sre_SRE_Match_expand, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Match_expand__doc__}, static PyObject * _sre_SRE_Match_expand_impl(MatchObject *self, PyObject *template); @@ -501,7 +497,7 @@ PyDoc_STRVAR(_sre_SRE_Match_groups__doc__, " Is used for groups that did not participate in the match."); #define _SRE_SRE_MATCH_GROUPS_METHODDEF \ - {"groups", (PyCFunction)_sre_SRE_Match_groups, METH_FASTCALL, _sre_SRE_Match_groups__doc__}, + {"groups", (PyCFunction)_sre_SRE_Match_groups, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Match_groups__doc__}, static PyObject * _sre_SRE_Match_groups_impl(MatchObject *self, PyObject *default_value); @@ -534,7 +530,7 @@ PyDoc_STRVAR(_sre_SRE_Match_groupdict__doc__, " Is used for groups that did not participate in the match."); #define _SRE_SRE_MATCH_GROUPDICT_METHODDEF \ - {"groupdict", (PyCFunction)_sre_SRE_Match_groupdict, METH_FASTCALL, _sre_SRE_Match_groupdict__doc__}, + {"groupdict", (PyCFunction)_sre_SRE_Match_groupdict, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Match_groupdict__doc__}, static PyObject * _sre_SRE_Match_groupdict_impl(MatchObject *self, PyObject *default_value); @@ -570,7 +566,7 @@ static Py_ssize_t _sre_SRE_Match_start_impl(MatchObject *self, PyObject *group); static PyObject * -_sre_SRE_Match_start(MatchObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_sre_SRE_Match_start(MatchObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *group = NULL; @@ -581,10 +577,6 @@ _sre_SRE_Match_start(MatchObject *self, PyObject **args, Py_ssize_t nargs, PyObj &group)) { goto exit; } - - if (!_PyArg_NoStackKeywords("start", kwnames)) { - goto exit; - } _return_value = _sre_SRE_Match_start_impl(self, group); if ((_return_value == -1) && PyErr_Occurred()) { goto exit; @@ -608,7 +600,7 @@ static Py_ssize_t _sre_SRE_Match_end_impl(MatchObject *self, PyObject *group); static PyObject * -_sre_SRE_Match_end(MatchObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_sre_SRE_Match_end(MatchObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *group = NULL; @@ -619,10 +611,6 @@ _sre_SRE_Match_end(MatchObject *self, PyObject **args, Py_ssize_t nargs, PyObjec &group)) { goto exit; } - - if (!_PyArg_NoStackKeywords("end", kwnames)) { - goto exit; - } _return_value = _sre_SRE_Match_end_impl(self, group); if ((_return_value == -1) && PyErr_Occurred()) { goto exit; @@ -646,7 +634,7 @@ static PyObject * _sre_SRE_Match_span_impl(MatchObject *self, PyObject *group); static PyObject * -_sre_SRE_Match_span(MatchObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_sre_SRE_Match_span(MatchObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *group = NULL; @@ -656,10 +644,6 @@ _sre_SRE_Match_span(MatchObject *self, PyObject **args, Py_ssize_t nargs, PyObje &group)) { goto exit; } - - if (!_PyArg_NoStackKeywords("span", kwnames)) { - goto exit; - } return_value = _sre_SRE_Match_span_impl(self, group); exit: @@ -689,7 +673,7 @@ PyDoc_STRVAR(_sre_SRE_Match___deepcopy____doc__, "\n"); #define _SRE_SRE_MATCH___DEEPCOPY___METHODDEF \ - {"__deepcopy__", (PyCFunction)_sre_SRE_Match___deepcopy__, METH_FASTCALL, _sre_SRE_Match___deepcopy____doc__}, + {"__deepcopy__", (PyCFunction)_sre_SRE_Match___deepcopy__, METH_FASTCALL|METH_KEYWORDS, _sre_SRE_Match___deepcopy____doc__}, static PyObject * _sre_SRE_Match___deepcopy___impl(MatchObject *self, PyObject *memo); @@ -745,4 +729,4 @@ _sre_SRE_Scanner_search(ScannerObject *self, PyObject *Py_UNUSED(ignored)) { return _sre_SRE_Scanner_search_impl(self); } -/*[clinic end generated code: output=ddfd6158e7ca39a3 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=af7684e3e708200f input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/_struct.inc b/third_party/python/Modules/clinic/_struct.inc index 3bc6318ad..0bff626b1 100644 --- a/third_party/python/Modules/clinic/_struct.inc +++ b/third_party/python/Modules/clinic/_struct.inc @@ -85,7 +85,7 @@ PyDoc_STRVAR(Struct_unpack_from__doc__, "See help(struct) for more on format strings."); #define STRUCT_UNPACK_FROM_METHODDEF \ - {"unpack_from", (PyCFunction)Struct_unpack_from, METH_FASTCALL, Struct_unpack_from__doc__}, + {"unpack_from", (PyCFunction)Struct_unpack_from, METH_FASTCALL|METH_KEYWORDS, Struct_unpack_from__doc__}, static PyObject * Struct_unpack_from_impl(PyStructObject *self, Py_buffer *buffer, @@ -173,7 +173,7 @@ static PyObject * unpack_impl(PyObject *module, PyObject *format, PyObject *inputstr); static PyObject * -unpack(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +unpack(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *format; @@ -184,10 +184,6 @@ unpack(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) &format, &inputstr)) { goto exit; } - - if (!_PyArg_NoStackKeywords("unpack", kwnames)) { - goto exit; - } return_value = unpack_impl(module, format, inputstr); exit: @@ -205,7 +201,7 @@ PyDoc_STRVAR(unpack_from__doc__, "See help(struct) for more on format strings."); #define UNPACK_FROM_METHODDEF \ - {"unpack_from", (PyCFunction)unpack_from, METH_FASTCALL, unpack_from__doc__}, + {"unpack_from", (PyCFunction)unpack_from, METH_FASTCALL|METH_KEYWORDS, unpack_from__doc__}, static PyObject * unpack_from_impl(PyObject *module, PyObject *format, Py_buffer *buffer, @@ -254,7 +250,7 @@ static PyObject * iter_unpack_impl(PyObject *module, PyObject *format, PyObject *buffer); static PyObject * -iter_unpack(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +iter_unpack(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *format; @@ -265,13 +261,9 @@ iter_unpack(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnam &format, &buffer)) { goto exit; } - - if (!_PyArg_NoStackKeywords("iter_unpack", kwnames)) { - goto exit; - } return_value = iter_unpack_impl(module, format, buffer); exit: return return_value; } -/*[clinic end generated code: output=db8152ad222fa3d0 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=c891fcba70dba650 input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/_weakref.inc b/third_party/python/Modules/clinic/_weakref.inc index 01d55fc2b..5069acf4e 100644 --- a/third_party/python/Modules/clinic/_weakref.inc +++ b/third_party/python/Modules/clinic/_weakref.inc @@ -45,7 +45,7 @@ _weakref__remove_dead_weakref_impl(PyObject *module, PyObject *dct, PyObject *key); static PyObject * -_weakref__remove_dead_weakref(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_weakref__remove_dead_weakref(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *dct; @@ -55,13 +55,9 @@ _weakref__remove_dead_weakref(PyObject *module, PyObject **args, Py_ssize_t narg &PyDict_Type, &dct, &key)) { goto exit; } - - if (!_PyArg_NoStackKeywords("_remove_dead_weakref", kwnames)) { - goto exit; - } return_value = _weakref__remove_dead_weakref_impl(module, dct, key); exit: return return_value; } -/*[clinic end generated code: output=b686303486bdfefd input=a9049054013a1b77]*/ +/*[clinic end generated code: output=87ddb70850080222 input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/arraymodule.inc b/third_party/python/Modules/clinic/arraymodule.inc index c09471eaf..c0a733f00 100644 --- a/third_party/python/Modules/clinic/arraymodule.inc +++ b/third_party/python/Modules/clinic/arraymodule.inc @@ -72,7 +72,7 @@ static PyObject * array_array_pop_impl(arrayobject *self, Py_ssize_t i); static PyObject * -array_array_pop(arrayobject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +array_array_pop(arrayobject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_ssize_t i = -1; @@ -81,10 +81,6 @@ array_array_pop(arrayobject *self, PyObject **args, Py_ssize_t nargs, PyObject * &i)) { goto exit; } - - if (!_PyArg_NoStackKeywords("pop", kwnames)) { - goto exit; - } return_value = array_array_pop_impl(self, i); exit: @@ -113,7 +109,7 @@ static PyObject * array_array_insert_impl(arrayobject *self, Py_ssize_t i, PyObject *v); static PyObject * -array_array_insert(arrayobject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +array_array_insert(arrayobject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_ssize_t i; @@ -123,10 +119,6 @@ array_array_insert(arrayobject *self, PyObject **args, Py_ssize_t nargs, PyObjec &i, &v)) { goto exit; } - - if (!_PyArg_NoStackKeywords("insert", kwnames)) { - goto exit; - } return_value = array_array_insert_impl(self, i, v); exit: @@ -215,7 +207,7 @@ static PyObject * array_array_fromfile_impl(arrayobject *self, PyObject *f, Py_ssize_t n); static PyObject * -array_array_fromfile(arrayobject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +array_array_fromfile(arrayobject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *f; @@ -225,10 +217,6 @@ array_array_fromfile(arrayobject *self, PyObject **args, Py_ssize_t nargs, PyObj &f, &n)) { goto exit; } - - if (!_PyArg_NoStackKeywords("fromfile", kwnames)) { - goto exit; - } return_value = array_array_fromfile_impl(self, f, n); exit: @@ -465,7 +453,7 @@ array__array_reconstructor_impl(PyObject *module, PyTypeObject *arraytype, PyObject *items); static PyObject * -array__array_reconstructor(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +array__array_reconstructor(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyTypeObject *arraytype; @@ -477,10 +465,6 @@ array__array_reconstructor(PyObject *module, PyObject **args, Py_ssize_t nargs, &arraytype, &typecode, &mformat_code, &items)) { goto exit; } - - if (!_PyArg_NoStackKeywords("_array_reconstructor", kwnames)) { - goto exit; - } return_value = array__array_reconstructor_impl(module, arraytype, typecode, mformat_code, items); exit: @@ -522,4 +506,4 @@ PyDoc_STRVAR(array_arrayiterator___setstate____doc__, #define ARRAY_ARRAYITERATOR___SETSTATE___METHODDEF \ {"__setstate__", (PyCFunction)array_arrayiterator___setstate__, METH_O, array_arrayiterator___setstate____doc__}, -/*[clinic end generated code: output=d186a7553c1f1a41 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=c7dfe61312b236a9 input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/audioop.inc b/third_party/python/Modules/clinic/audioop.inc index 89a2bf7b8..ff34bdf3e 100644 --- a/third_party/python/Modules/clinic/audioop.inc +++ b/third_party/python/Modules/clinic/audioop.inc @@ -17,7 +17,7 @@ audioop_getsample_impl(PyObject *module, Py_buffer *fragment, int width, Py_ssize_t index); static PyObject * -audioop_getsample(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_getsample(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -28,10 +28,6 @@ audioop_getsample(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject &fragment, &width, &index)) { goto exit; } - - if (!_PyArg_NoStackKeywords("getsample", kwnames)) { - goto exit; - } return_value = audioop_getsample_impl(module, &fragment, width, index); exit: @@ -56,7 +52,7 @@ static PyObject * audioop_max_impl(PyObject *module, Py_buffer *fragment, int width); static PyObject * -audioop_max(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_max(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -66,10 +62,6 @@ audioop_max(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnam &fragment, &width)) { goto exit; } - - if (!_PyArg_NoStackKeywords("max", kwnames)) { - goto exit; - } return_value = audioop_max_impl(module, &fragment, width); exit: @@ -94,7 +86,7 @@ static PyObject * audioop_minmax_impl(PyObject *module, Py_buffer *fragment, int width); static PyObject * -audioop_minmax(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_minmax(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -104,10 +96,6 @@ audioop_minmax(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kw &fragment, &width)) { goto exit; } - - if (!_PyArg_NoStackKeywords("minmax", kwnames)) { - goto exit; - } return_value = audioop_minmax_impl(module, &fragment, width); exit: @@ -132,7 +120,7 @@ static PyObject * audioop_avg_impl(PyObject *module, Py_buffer *fragment, int width); static PyObject * -audioop_avg(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_avg(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -142,10 +130,6 @@ audioop_avg(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnam &fragment, &width)) { goto exit; } - - if (!_PyArg_NoStackKeywords("avg", kwnames)) { - goto exit; - } return_value = audioop_avg_impl(module, &fragment, width); exit: @@ -170,7 +154,7 @@ static PyObject * audioop_rms_impl(PyObject *module, Py_buffer *fragment, int width); static PyObject * -audioop_rms(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_rms(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -180,10 +164,6 @@ audioop_rms(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnam &fragment, &width)) { goto exit; } - - if (!_PyArg_NoStackKeywords("rms", kwnames)) { - goto exit; - } return_value = audioop_rms_impl(module, &fragment, width); exit: @@ -209,7 +189,7 @@ audioop_findfit_impl(PyObject *module, Py_buffer *fragment, Py_buffer *reference); static PyObject * -audioop_findfit(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_findfit(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -219,10 +199,6 @@ audioop_findfit(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *k &fragment, &reference)) { goto exit; } - - if (!_PyArg_NoStackKeywords("findfit", kwnames)) { - goto exit; - } return_value = audioop_findfit_impl(module, &fragment, &reference); exit: @@ -252,7 +228,7 @@ audioop_findfactor_impl(PyObject *module, Py_buffer *fragment, Py_buffer *reference); static PyObject * -audioop_findfactor(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_findfactor(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -262,10 +238,6 @@ audioop_findfactor(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject &fragment, &reference)) { goto exit; } - - if (!_PyArg_NoStackKeywords("findfactor", kwnames)) { - goto exit; - } return_value = audioop_findfactor_impl(module, &fragment, &reference); exit: @@ -295,7 +267,7 @@ audioop_findmax_impl(PyObject *module, Py_buffer *fragment, Py_ssize_t length); static PyObject * -audioop_findmax(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_findmax(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -305,10 +277,6 @@ audioop_findmax(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *k &fragment, &length)) { goto exit; } - - if (!_PyArg_NoStackKeywords("findmax", kwnames)) { - goto exit; - } return_value = audioop_findmax_impl(module, &fragment, length); exit: @@ -333,7 +301,7 @@ static PyObject * audioop_avgpp_impl(PyObject *module, Py_buffer *fragment, int width); static PyObject * -audioop_avgpp(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_avgpp(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -343,10 +311,6 @@ audioop_avgpp(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwn &fragment, &width)) { goto exit; } - - if (!_PyArg_NoStackKeywords("avgpp", kwnames)) { - goto exit; - } return_value = audioop_avgpp_impl(module, &fragment, width); exit: @@ -371,7 +335,7 @@ static PyObject * audioop_maxpp_impl(PyObject *module, Py_buffer *fragment, int width); static PyObject * -audioop_maxpp(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_maxpp(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -381,10 +345,6 @@ audioop_maxpp(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwn &fragment, &width)) { goto exit; } - - if (!_PyArg_NoStackKeywords("maxpp", kwnames)) { - goto exit; - } return_value = audioop_maxpp_impl(module, &fragment, width); exit: @@ -409,7 +369,7 @@ static PyObject * audioop_cross_impl(PyObject *module, Py_buffer *fragment, int width); static PyObject * -audioop_cross(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_cross(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -419,10 +379,6 @@ audioop_cross(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwn &fragment, &width)) { goto exit; } - - if (!_PyArg_NoStackKeywords("cross", kwnames)) { - goto exit; - } return_value = audioop_cross_impl(module, &fragment, width); exit: @@ -448,7 +404,7 @@ audioop_mul_impl(PyObject *module, Py_buffer *fragment, int width, double factor); static PyObject * -audioop_mul(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_mul(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -459,10 +415,6 @@ audioop_mul(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnam &fragment, &width, &factor)) { goto exit; } - - if (!_PyArg_NoStackKeywords("mul", kwnames)) { - goto exit; - } return_value = audioop_mul_impl(module, &fragment, width, factor); exit: @@ -488,7 +440,7 @@ audioop_tomono_impl(PyObject *module, Py_buffer *fragment, int width, double lfactor, double rfactor); static PyObject * -audioop_tomono(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_tomono(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -500,10 +452,6 @@ audioop_tomono(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kw &fragment, &width, &lfactor, &rfactor)) { goto exit; } - - if (!_PyArg_NoStackKeywords("tomono", kwnames)) { - goto exit; - } return_value = audioop_tomono_impl(module, &fragment, width, lfactor, rfactor); exit: @@ -529,7 +477,7 @@ audioop_tostereo_impl(PyObject *module, Py_buffer *fragment, int width, double lfactor, double rfactor); static PyObject * -audioop_tostereo(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_tostereo(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -541,10 +489,6 @@ audioop_tostereo(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject * &fragment, &width, &lfactor, &rfactor)) { goto exit; } - - if (!_PyArg_NoStackKeywords("tostereo", kwnames)) { - goto exit; - } return_value = audioop_tostereo_impl(module, &fragment, width, lfactor, rfactor); exit: @@ -570,7 +514,7 @@ audioop_add_impl(PyObject *module, Py_buffer *fragment1, Py_buffer *fragment2, int width); static PyObject * -audioop_add(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_add(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment1 = {NULL, NULL}; @@ -581,10 +525,6 @@ audioop_add(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnam &fragment1, &fragment2, &width)) { goto exit; } - - if (!_PyArg_NoStackKeywords("add", kwnames)) { - goto exit; - } return_value = audioop_add_impl(module, &fragment1, &fragment2, width); exit: @@ -613,7 +553,7 @@ static PyObject * audioop_bias_impl(PyObject *module, Py_buffer *fragment, int width, int bias); static PyObject * -audioop_bias(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_bias(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -624,10 +564,6 @@ audioop_bias(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwna &fragment, &width, &bias)) { goto exit; } - - if (!_PyArg_NoStackKeywords("bias", kwnames)) { - goto exit; - } return_value = audioop_bias_impl(module, &fragment, width, bias); exit: @@ -652,7 +588,7 @@ static PyObject * audioop_reverse_impl(PyObject *module, Py_buffer *fragment, int width); static PyObject * -audioop_reverse(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_reverse(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -662,10 +598,6 @@ audioop_reverse(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *k &fragment, &width)) { goto exit; } - - if (!_PyArg_NoStackKeywords("reverse", kwnames)) { - goto exit; - } return_value = audioop_reverse_impl(module, &fragment, width); exit: @@ -690,7 +622,7 @@ static PyObject * audioop_byteswap_impl(PyObject *module, Py_buffer *fragment, int width); static PyObject * -audioop_byteswap(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_byteswap(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -700,10 +632,6 @@ audioop_byteswap(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject * &fragment, &width)) { goto exit; } - - if (!_PyArg_NoStackKeywords("byteswap", kwnames)) { - goto exit; - } return_value = audioop_byteswap_impl(module, &fragment, width); exit: @@ -729,7 +657,7 @@ audioop_lin2lin_impl(PyObject *module, Py_buffer *fragment, int width, int newwidth); static PyObject * -audioop_lin2lin(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_lin2lin(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -740,10 +668,6 @@ audioop_lin2lin(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *k &fragment, &width, &newwidth)) { goto exit; } - - if (!_PyArg_NoStackKeywords("lin2lin", kwnames)) { - goto exit; - } return_value = audioop_lin2lin_impl(module, &fragment, width, newwidth); exit: @@ -771,7 +695,7 @@ audioop_ratecv_impl(PyObject *module, Py_buffer *fragment, int width, int weightA, int weightB); static PyObject * -audioop_ratecv(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_ratecv(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -787,10 +711,6 @@ audioop_ratecv(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kw &fragment, &width, &nchannels, &inrate, &outrate, &state, &weightA, &weightB)) { goto exit; } - - if (!_PyArg_NoStackKeywords("ratecv", kwnames)) { - goto exit; - } return_value = audioop_ratecv_impl(module, &fragment, width, nchannels, inrate, outrate, state, weightA, weightB); exit: @@ -815,7 +735,7 @@ static PyObject * audioop_lin2ulaw_impl(PyObject *module, Py_buffer *fragment, int width); static PyObject * -audioop_lin2ulaw(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_lin2ulaw(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -825,10 +745,6 @@ audioop_lin2ulaw(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject * &fragment, &width)) { goto exit; } - - if (!_PyArg_NoStackKeywords("lin2ulaw", kwnames)) { - goto exit; - } return_value = audioop_lin2ulaw_impl(module, &fragment, width); exit: @@ -853,7 +769,7 @@ static PyObject * audioop_ulaw2lin_impl(PyObject *module, Py_buffer *fragment, int width); static PyObject * -audioop_ulaw2lin(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_ulaw2lin(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -863,10 +779,6 @@ audioop_ulaw2lin(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject * &fragment, &width)) { goto exit; } - - if (!_PyArg_NoStackKeywords("ulaw2lin", kwnames)) { - goto exit; - } return_value = audioop_ulaw2lin_impl(module, &fragment, width); exit: @@ -891,7 +803,7 @@ static PyObject * audioop_lin2alaw_impl(PyObject *module, Py_buffer *fragment, int width); static PyObject * -audioop_lin2alaw(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_lin2alaw(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -901,10 +813,6 @@ audioop_lin2alaw(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject * &fragment, &width)) { goto exit; } - - if (!_PyArg_NoStackKeywords("lin2alaw", kwnames)) { - goto exit; - } return_value = audioop_lin2alaw_impl(module, &fragment, width); exit: @@ -929,7 +837,7 @@ static PyObject * audioop_alaw2lin_impl(PyObject *module, Py_buffer *fragment, int width); static PyObject * -audioop_alaw2lin(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_alaw2lin(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -939,10 +847,6 @@ audioop_alaw2lin(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject * &fragment, &width)) { goto exit; } - - if (!_PyArg_NoStackKeywords("alaw2lin", kwnames)) { - goto exit; - } return_value = audioop_alaw2lin_impl(module, &fragment, width); exit: @@ -968,7 +872,7 @@ audioop_lin2adpcm_impl(PyObject *module, Py_buffer *fragment, int width, PyObject *state); static PyObject * -audioop_lin2adpcm(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_lin2adpcm(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -979,10 +883,6 @@ audioop_lin2adpcm(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject &fragment, &width, &state)) { goto exit; } - - if (!_PyArg_NoStackKeywords("lin2adpcm", kwnames)) { - goto exit; - } return_value = audioop_lin2adpcm_impl(module, &fragment, width, state); exit: @@ -1008,7 +908,7 @@ audioop_adpcm2lin_impl(PyObject *module, Py_buffer *fragment, int width, PyObject *state); static PyObject * -audioop_adpcm2lin(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +audioop_adpcm2lin(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; @@ -1019,10 +919,6 @@ audioop_adpcm2lin(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject &fragment, &width, &state)) { goto exit; } - - if (!_PyArg_NoStackKeywords("adpcm2lin", kwnames)) { - goto exit; - } return_value = audioop_adpcm2lin_impl(module, &fragment, width, state); exit: @@ -1033,4 +929,4 @@ exit: return return_value; } -/*[clinic end generated code: output=ee7c63ec28a11b78 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=e2076026235d7f0f input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/binascii.inc b/third_party/python/Modules/clinic/binascii.inc index 570d4c115..1b22a0c20 100644 --- a/third_party/python/Modules/clinic/binascii.inc +++ b/third_party/python/Modules/clinic/binascii.inc @@ -104,7 +104,7 @@ PyDoc_STRVAR(binascii_b2a_base64__doc__, "Base64-code line of data."); #define BINASCII_B2A_BASE64_METHODDEF \ - {"b2a_base64", (PyCFunction)binascii_b2a_base64, METH_FASTCALL, binascii_b2a_base64__doc__}, + {"b2a_base64", (PyCFunction)binascii_b2a_base64, METH_FASTCALL|METH_KEYWORDS, binascii_b2a_base64__doc__}, static PyObject * binascii_b2a_base64_impl(PyObject *module, Py_buffer *data, int newline); @@ -273,7 +273,7 @@ static unsigned int binascii_crc_hqx_impl(PyObject *module, Py_buffer *data, unsigned int crc); static PyObject * -binascii_crc_hqx(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +binascii_crc_hqx(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -284,10 +284,6 @@ binascii_crc_hqx(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject * &data, &crc)) { goto exit; } - - if (!_PyArg_NoStackKeywords("crc_hqx", kwnames)) { - goto exit; - } _return_value = binascii_crc_hqx_impl(module, &data, crc); if ((_return_value == (unsigned int)-1) && PyErr_Occurred()) { goto exit; @@ -316,7 +312,7 @@ static unsigned int binascii_crc32_impl(PyObject *module, Py_buffer *data, unsigned int crc); static PyObject * -binascii_crc32(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +binascii_crc32(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -327,10 +323,6 @@ binascii_crc32(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kw &data, &crc)) { goto exit; } - - if (!_PyArg_NoStackKeywords("crc32", kwnames)) { - goto exit; - } _return_value = binascii_crc32_impl(module, &data, crc); if ((_return_value == (unsigned int)-1) && PyErr_Occurred()) { goto exit; @@ -489,7 +481,7 @@ PyDoc_STRVAR(binascii_a2b_qp__doc__, "Decode a string of qp-encoded data."); #define BINASCII_A2B_QP_METHODDEF \ - {"a2b_qp", (PyCFunction)binascii_a2b_qp, METH_FASTCALL, binascii_a2b_qp__doc__}, + {"a2b_qp", (PyCFunction)binascii_a2b_qp, METH_FASTCALL|METH_KEYWORDS, binascii_a2b_qp__doc__}, static PyObject * binascii_a2b_qp_impl(PyObject *module, Py_buffer *data, int header); @@ -528,7 +520,7 @@ PyDoc_STRVAR(binascii_b2a_qp__doc__, "are both encoded. When quotetabs is set, space and tabs are encoded."); #define BINASCII_B2A_QP_METHODDEF \ - {"b2a_qp", (PyCFunction)binascii_b2a_qp, METH_FASTCALL, binascii_b2a_qp__doc__}, + {"b2a_qp", (PyCFunction)binascii_b2a_qp, METH_FASTCALL|METH_KEYWORDS, binascii_b2a_qp__doc__}, static PyObject * binascii_b2a_qp_impl(PyObject *module, Py_buffer *data, int quotetabs, @@ -559,4 +551,4 @@ exit: return return_value; } -/*[clinic end generated code: output=4a418f883ccc79fe input=a9049054013a1b77]*/ +/*[clinic end generated code: output=e7dfb211de8cc097 input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/cmathmodule.inc b/third_party/python/Modules/clinic/cmathmodule.inc index 2f56b9496..920e1bfb4 100644 --- a/third_party/python/Modules/clinic/cmathmodule.inc +++ b/third_party/python/Modules/clinic/cmathmodule.inc @@ -648,7 +648,7 @@ static PyObject * cmath_log_impl(PyObject *module, Py_complex x, PyObject *y_obj); static PyObject * -cmath_log(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +cmath_log(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_complex x; @@ -658,10 +658,6 @@ cmath_log(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames &x, &y_obj)) { goto exit; } - - if (!_PyArg_NoStackKeywords("log", kwnames)) { - goto exit; - } return_value = cmath_log_impl(module, x, y_obj); exit: @@ -737,7 +733,7 @@ static PyObject * cmath_rect_impl(PyObject *module, double r, double phi); static PyObject * -cmath_rect(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +cmath_rect(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; double r; @@ -747,10 +743,6 @@ cmath_rect(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwname &r, &phi)) { goto exit; } - - if (!_PyArg_NoStackKeywords("rect", kwnames)) { - goto exit; - } return_value = cmath_rect_impl(module, r, phi); exit: @@ -860,7 +852,7 @@ PyDoc_STRVAR(cmath_isclose__doc__, "not close to anything, even itself. inf and -inf are only close to themselves."); #define CMATH_ISCLOSE_METHODDEF \ - {"isclose", (PyCFunction)cmath_isclose, METH_FASTCALL, cmath_isclose__doc__}, + {"isclose", (PyCFunction)cmath_isclose, METH_FASTCALL|METH_KEYWORDS, cmath_isclose__doc__}, static int cmath_isclose_impl(PyObject *module, Py_complex a, Py_complex b, @@ -891,4 +883,4 @@ cmath_isclose(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwn exit: return return_value; } -/*[clinic end generated code: output=93eff5d4c242ee57 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=51ba28d27d10264e input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/fcntlmodule.inc b/third_party/python/Modules/clinic/fcntlmodule.inc index 24ca699f1..2a3e92305 100644 --- a/third_party/python/Modules/clinic/fcntlmodule.inc +++ b/third_party/python/Modules/clinic/fcntlmodule.inc @@ -26,7 +26,7 @@ static PyObject * fcntl_fcntl_impl(PyObject *module, int fd, int code, PyObject *arg); static PyObject * -fcntl_fcntl(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +fcntl_fcntl(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int fd; @@ -37,10 +37,6 @@ fcntl_fcntl(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnam conv_descriptor, &fd, &code, &arg)) { goto exit; } - - if (!_PyArg_NoStackKeywords("fcntl", kwnames)) { - goto exit; - } return_value = fcntl_fcntl_impl(module, fd, code, arg); exit: @@ -88,7 +84,7 @@ fcntl_ioctl_impl(PyObject *module, int fd, unsigned int code, PyObject *ob_arg, int mutate_arg); static PyObject * -fcntl_ioctl(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +fcntl_ioctl(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int fd; @@ -100,10 +96,6 @@ fcntl_ioctl(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnam conv_descriptor, &fd, &code, &ob_arg, &mutate_arg)) { goto exit; } - - if (!_PyArg_NoStackKeywords("ioctl", kwnames)) { - goto exit; - } return_value = fcntl_ioctl_impl(module, fd, code, ob_arg, mutate_arg); exit: @@ -126,7 +118,7 @@ static PyObject * fcntl_flock_impl(PyObject *module, int fd, int code); static PyObject * -fcntl_flock(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +fcntl_flock(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int fd; @@ -136,10 +128,6 @@ fcntl_flock(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnam conv_descriptor, &fd, &code)) { goto exit; } - - if (!_PyArg_NoStackKeywords("flock", kwnames)) { - goto exit; - } return_value = fcntl_flock_impl(module, fd, code); exit: @@ -181,7 +169,7 @@ fcntl_lockf_impl(PyObject *module, int fd, int code, PyObject *lenobj, PyObject *startobj, int whence); static PyObject * -fcntl_lockf(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +fcntl_lockf(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int fd; @@ -194,13 +182,9 @@ fcntl_lockf(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnam conv_descriptor, &fd, &code, &lenobj, &startobj, &whence)) { goto exit; } - - if (!_PyArg_NoStackKeywords("lockf", kwnames)) { - goto exit; - } return_value = fcntl_lockf_impl(module, fd, code, lenobj, startobj, whence); exit: return return_value; } -/*[clinic end generated code: output=b67e9579722e6d4f input=a9049054013a1b77]*/ +/*[clinic end generated code: output=6105e3ada306f434 input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/grpmodule.inc b/third_party/python/Modules/clinic/grpmodule.inc index 5e4a02dcb..73d69ef70 100644 --- a/third_party/python/Modules/clinic/grpmodule.inc +++ b/third_party/python/Modules/clinic/grpmodule.inc @@ -12,7 +12,7 @@ PyDoc_STRVAR(grp_getgrgid__doc__, "If id is not valid, raise KeyError."); #define GRP_GETGRGID_METHODDEF \ - {"getgrgid", (PyCFunction)grp_getgrgid, METH_FASTCALL, grp_getgrgid__doc__}, + {"getgrgid", (PyCFunction)grp_getgrgid, METH_FASTCALL|METH_KEYWORDS, grp_getgrgid__doc__}, static PyObject * grp_getgrgid_impl(PyObject *module, PyObject *id); @@ -44,7 +44,7 @@ PyDoc_STRVAR(grp_getgrnam__doc__, "If name is not valid, raise KeyError."); #define GRP_GETGRNAM_METHODDEF \ - {"getgrnam", (PyCFunction)grp_getgrnam, METH_FASTCALL, grp_getgrnam__doc__}, + {"getgrnam", (PyCFunction)grp_getgrnam, METH_FASTCALL|METH_KEYWORDS, grp_getgrnam__doc__}, static PyObject * grp_getgrnam_impl(PyObject *module, PyObject *name); @@ -87,4 +87,4 @@ grp_getgrall(PyObject *module, PyObject *Py_UNUSED(ignored)) { return grp_getgrall_impl(module); } -/*[clinic end generated code: output=fb690db5e676d378 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=e7ef2cbc437eedcb input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/posixmodule.inc b/third_party/python/Modules/clinic/posixmodule.inc index 4850df894..60d0e180e 100644 --- a/third_party/python/Modules/clinic/posixmodule.inc +++ b/third_party/python/Modules/clinic/posixmodule.inc @@ -29,7 +29,7 @@ PyDoc_STRVAR(os_stat__doc__, " an open file descriptor."); #define OS_STAT_METHODDEF \ - {"stat", (PyCFunction)os_stat, METH_FASTCALL, os_stat__doc__}, + {"stat", (PyCFunction)os_stat, METH_FASTCALL|METH_KEYWORDS, os_stat__doc__}, static PyObject * os_stat_impl(PyObject *module, path_t *path, int dir_fd, int follow_symlinks); @@ -67,7 +67,7 @@ PyDoc_STRVAR(os_lstat__doc__, "Equivalent to stat(path, follow_symlinks=False)."); #define OS_LSTAT_METHODDEF \ - {"lstat", (PyCFunction)os_lstat, METH_FASTCALL, os_lstat__doc__}, + {"lstat", (PyCFunction)os_lstat, METH_FASTCALL|METH_KEYWORDS, os_lstat__doc__}, static PyObject * os_lstat_impl(PyObject *module, path_t *path, int dir_fd); @@ -127,7 +127,7 @@ PyDoc_STRVAR(os_access__doc__, " has the specified access to the path."); #define OS_ACCESS_METHODDEF \ - {"access", (PyCFunction)os_access, METH_FASTCALL, os_access__doc__}, + {"access", (PyCFunction)os_access, METH_FASTCALL|METH_KEYWORDS, os_access__doc__}, static int os_access_impl(PyObject *module, path_t *path, int mode, int dir_fd, @@ -235,7 +235,7 @@ PyDoc_STRVAR(os_chdir__doc__, " If this functionality is unavailable, using it raises an exception."); #define OS_CHDIR_METHODDEF \ - {"chdir", (PyCFunction)os_chdir, METH_FASTCALL, os_chdir__doc__}, + {"chdir", (PyCFunction)os_chdir, METH_FASTCALL|METH_KEYWORDS, os_chdir__doc__}, static PyObject * os_chdir_impl(PyObject *module, path_t *path); @@ -273,7 +273,7 @@ PyDoc_STRVAR(os_fchdir__doc__, "Equivalent to os.chdir(fd)."); #define OS_FCHDIR_METHODDEF \ - {"fchdir", (PyCFunction)os_fchdir, METH_FASTCALL, os_fchdir__doc__}, + {"fchdir", (PyCFunction)os_fchdir, METH_FASTCALL|METH_KEYWORDS, os_fchdir__doc__}, static PyObject * os_fchdir_impl(PyObject *module, int fd); @@ -325,7 +325,7 @@ PyDoc_STRVAR(os_chmod__doc__, " If they are unavailable, using them will raise a NotImplementedError."); #define OS_CHMOD_METHODDEF \ - {"chmod", (PyCFunction)os_chmod, METH_FASTCALL, os_chmod__doc__}, + {"chmod", (PyCFunction)os_chmod, METH_FASTCALL|METH_KEYWORDS, os_chmod__doc__}, static PyObject * os_chmod_impl(PyObject *module, path_t *path, int mode, int dir_fd, @@ -366,7 +366,7 @@ PyDoc_STRVAR(os_fchmod__doc__, "Equivalent to os.chmod(fd, mode)."); #define OS_FCHMOD_METHODDEF \ - {"fchmod", (PyCFunction)os_fchmod, METH_FASTCALL, os_fchmod__doc__}, + {"fchmod", (PyCFunction)os_fchmod, METH_FASTCALL|METH_KEYWORDS, os_fchmod__doc__}, static PyObject * os_fchmod_impl(PyObject *module, int fd, int mode); @@ -404,7 +404,7 @@ PyDoc_STRVAR(os_lchmod__doc__, "Equivalent to chmod(path, mode, follow_symlinks=False).\""); #define OS_LCHMOD_METHODDEF \ - {"lchmod", (PyCFunction)os_lchmod, METH_FASTCALL, os_lchmod__doc__}, + {"lchmod", (PyCFunction)os_lchmod, METH_FASTCALL|METH_KEYWORDS, os_lchmod__doc__}, static PyObject * os_lchmod_impl(PyObject *module, path_t *path, int mode); @@ -448,7 +448,7 @@ PyDoc_STRVAR(os_chflags__doc__, "unavailable, using it will raise a NotImplementedError."); #define OS_CHFLAGS_METHODDEF \ - {"chflags", (PyCFunction)os_chflags, METH_FASTCALL, os_chflags__doc__}, + {"chflags", (PyCFunction)os_chflags, METH_FASTCALL|METH_KEYWORDS, os_chflags__doc__}, static PyObject * os_chflags_impl(PyObject *module, path_t *path, unsigned long flags, @@ -491,7 +491,7 @@ PyDoc_STRVAR(os_lchflags__doc__, "Equivalent to chflags(path, flags, follow_symlinks=False)."); #define OS_LCHFLAGS_METHODDEF \ - {"lchflags", (PyCFunction)os_lchflags, METH_FASTCALL, os_lchflags__doc__}, + {"lchflags", (PyCFunction)os_lchflags, METH_FASTCALL|METH_KEYWORDS, os_lchflags__doc__}, static PyObject * os_lchflags_impl(PyObject *module, path_t *path, unsigned long flags); @@ -529,7 +529,7 @@ PyDoc_STRVAR(os_chroot__doc__, "Change root directory to path."); #define OS_CHROOT_METHODDEF \ - {"chroot", (PyCFunction)os_chroot, METH_FASTCALL, os_chroot__doc__}, + {"chroot", (PyCFunction)os_chroot, METH_FASTCALL|METH_KEYWORDS, os_chroot__doc__}, static PyObject * os_chroot_impl(PyObject *module, path_t *path); @@ -566,7 +566,7 @@ PyDoc_STRVAR(os_fsync__doc__, "Force write of fd to disk."); #define OS_FSYNC_METHODDEF \ - {"fsync", (PyCFunction)os_fsync, METH_FASTCALL, os_fsync__doc__}, + {"fsync", (PyCFunction)os_fsync, METH_FASTCALL|METH_KEYWORDS, os_fsync__doc__}, static PyObject * os_fsync_impl(PyObject *module, int fd); @@ -622,7 +622,7 @@ PyDoc_STRVAR(os_fdatasync__doc__, "Force write of fd to disk without forcing update of metadata."); #define OS_FDATASYNC_METHODDEF \ - {"fdatasync", (PyCFunction)os_fdatasync, METH_FASTCALL, os_fdatasync__doc__}, + {"fdatasync", (PyCFunction)os_fdatasync, METH_FASTCALL|METH_KEYWORDS, os_fdatasync__doc__}, static PyObject * os_fdatasync_impl(PyObject *module, int fd); @@ -680,7 +680,7 @@ PyDoc_STRVAR(os_chown__doc__, " If they are unavailable, using them will raise a NotImplementedError."); #define OS_CHOWN_METHODDEF \ - {"chown", (PyCFunction)os_chown, METH_FASTCALL, os_chown__doc__}, + {"chown", (PyCFunction)os_chown, METH_FASTCALL|METH_KEYWORDS, os_chown__doc__}, static PyObject * os_chown_impl(PyObject *module, path_t *path, uid_t uid, gid_t gid, @@ -724,7 +724,7 @@ PyDoc_STRVAR(os_fchown__doc__, "Equivalent to os.chown(fd, uid, gid)."); #define OS_FCHOWN_METHODDEF \ - {"fchown", (PyCFunction)os_fchown, METH_FASTCALL, os_fchown__doc__}, + {"fchown", (PyCFunction)os_fchown, METH_FASTCALL|METH_KEYWORDS, os_fchown__doc__}, static PyObject * os_fchown_impl(PyObject *module, int fd, uid_t uid, gid_t gid); @@ -763,7 +763,7 @@ PyDoc_STRVAR(os_lchown__doc__, "Equivalent to os.chown(path, uid, gid, follow_symlinks=False)."); #define OS_LCHOWN_METHODDEF \ - {"lchown", (PyCFunction)os_lchown, METH_FASTCALL, os_lchown__doc__}, + {"lchown", (PyCFunction)os_lchown, METH_FASTCALL|METH_KEYWORDS, os_lchown__doc__}, static PyObject * os_lchown_impl(PyObject *module, path_t *path, uid_t uid, gid_t gid); @@ -849,7 +849,7 @@ PyDoc_STRVAR(os_link__doc__, " NotImplementedError."); #define OS_LINK_METHODDEF \ - {"link", (PyCFunction)os_link, METH_FASTCALL, os_link__doc__}, + {"link", (PyCFunction)os_link, METH_FASTCALL|METH_KEYWORDS, os_link__doc__}, static PyObject * os_link_impl(PyObject *module, path_t *src, path_t *dst, int src_dir_fd, @@ -902,7 +902,7 @@ PyDoc_STRVAR(os_listdir__doc__, "entries \'.\' and \'..\' even if they are present in the directory."); #define OS_LISTDIR_METHODDEF \ - {"listdir", (PyCFunction)os_listdir, METH_FASTCALL, os_listdir__doc__}, + {"listdir", (PyCFunction)os_listdir, METH_FASTCALL|METH_KEYWORDS, os_listdir__doc__}, static PyObject * os_listdir_impl(PyObject *module, path_t *path); @@ -1029,7 +1029,7 @@ PyDoc_STRVAR(os__getvolumepathname__doc__, "A helper function for ismount on Win32."); #define OS__GETVOLUMEPATHNAME_METHODDEF \ - {"_getvolumepathname", (PyCFunction)os__getvolumepathname, METH_FASTCALL, os__getvolumepathname__doc__}, + {"_getvolumepathname", (PyCFunction)os__getvolumepathname, METH_FASTCALL|METH_KEYWORDS, os__getvolumepathname__doc__}, static PyObject * os__getvolumepathname_impl(PyObject *module, PyObject *path); @@ -1066,7 +1066,7 @@ PyDoc_STRVAR(os_mkdir__doc__, "The mode argument is ignored on Windows."); #define OS_MKDIR_METHODDEF \ - {"mkdir", (PyCFunction)os_mkdir, METH_FASTCALL, os_mkdir__doc__}, + {"mkdir", (PyCFunction)os_mkdir, METH_FASTCALL|METH_KEYWORDS, os_mkdir__doc__}, static PyObject * os_mkdir_impl(PyObject *module, path_t *path, int mode, int dir_fd); @@ -1134,7 +1134,7 @@ PyDoc_STRVAR(os_getpriority__doc__, "Return program scheduling priority."); #define OS_GETPRIORITY_METHODDEF \ - {"getpriority", (PyCFunction)os_getpriority, METH_FASTCALL, os_getpriority__doc__}, + {"getpriority", (PyCFunction)os_getpriority, METH_FASTCALL|METH_KEYWORDS, os_getpriority__doc__}, static PyObject * os_getpriority_impl(PyObject *module, int which, int who); @@ -1169,7 +1169,7 @@ PyDoc_STRVAR(os_setpriority__doc__, "Set program scheduling priority."); #define OS_SETPRIORITY_METHODDEF \ - {"setpriority", (PyCFunction)os_setpriority, METH_FASTCALL, os_setpriority__doc__}, + {"setpriority", (PyCFunction)os_setpriority, METH_FASTCALL|METH_KEYWORDS, os_setpriority__doc__}, static PyObject * os_setpriority_impl(PyObject *module, int which, int who, int priority); @@ -1209,7 +1209,7 @@ PyDoc_STRVAR(os_rename__doc__, " If they are unavailable, using them will raise a NotImplementedError."); #define OS_RENAME_METHODDEF \ - {"rename", (PyCFunction)os_rename, METH_FASTCALL, os_rename__doc__}, + {"rename", (PyCFunction)os_rename, METH_FASTCALL|METH_KEYWORDS, os_rename__doc__}, static PyObject * os_rename_impl(PyObject *module, path_t *src, path_t *dst, int src_dir_fd, @@ -1254,7 +1254,7 @@ PyDoc_STRVAR(os_replace__doc__, " If they are unavailable, using them will raise a NotImplementedError.\""); #define OS_REPLACE_METHODDEF \ - {"replace", (PyCFunction)os_replace, METH_FASTCALL, os_replace__doc__}, + {"replace", (PyCFunction)os_replace, METH_FASTCALL|METH_KEYWORDS, os_replace__doc__}, static PyObject * os_replace_impl(PyObject *module, path_t *src, path_t *dst, int src_dir_fd, @@ -1298,7 +1298,7 @@ PyDoc_STRVAR(os_rmdir__doc__, " If it is unavailable, using it will raise a NotImplementedError."); #define OS_RMDIR_METHODDEF \ - {"rmdir", (PyCFunction)os_rmdir, METH_FASTCALL, os_rmdir__doc__}, + {"rmdir", (PyCFunction)os_rmdir, METH_FASTCALL|METH_KEYWORDS, os_rmdir__doc__}, static PyObject * os_rmdir_impl(PyObject *module, path_t *path, int dir_fd); @@ -1334,7 +1334,7 @@ PyDoc_STRVAR(os_system__doc__, "Execute the command in a subshell."); #define OS_SYSTEM_METHODDEF \ - {"system", (PyCFunction)os_system, METH_FASTCALL, os_system__doc__}, + {"system", (PyCFunction)os_system, METH_FASTCALL|METH_KEYWORDS, os_system__doc__}, static long os_system_impl(PyObject *module, Py_UNICODE *command); @@ -1373,7 +1373,7 @@ PyDoc_STRVAR(os_system__doc__, "Execute the command in a subshell."); #define OS_SYSTEM_METHODDEF \ - {"system", (PyCFunction)os_system, METH_FASTCALL, os_system__doc__}, + {"system", (PyCFunction)os_system, METH_FASTCALL|METH_KEYWORDS, os_system__doc__}, static long os_system_impl(PyObject *module, PyObject *command); @@ -1445,7 +1445,7 @@ PyDoc_STRVAR(os_unlink__doc__, " If it is unavailable, using it will raise a NotImplementedError."); #define OS_UNLINK_METHODDEF \ - {"unlink", (PyCFunction)os_unlink, METH_FASTCALL, os_unlink__doc__}, + {"unlink", (PyCFunction)os_unlink, METH_FASTCALL|METH_KEYWORDS, os_unlink__doc__}, static PyObject * os_unlink_impl(PyObject *module, path_t *path, int dir_fd); @@ -1484,7 +1484,7 @@ PyDoc_STRVAR(os_remove__doc__, " If it is unavailable, using it will raise a NotImplementedError."); #define OS_REMOVE_METHODDEF \ - {"remove", (PyCFunction)os_remove, METH_FASTCALL, os_remove__doc__}, + {"remove", (PyCFunction)os_remove, METH_FASTCALL|METH_KEYWORDS, os_remove__doc__}, static PyObject * os_remove_impl(PyObject *module, path_t *path, int dir_fd); @@ -1566,7 +1566,7 @@ PyDoc_STRVAR(os_utime__doc__, " If they are unavailable, using them will raise a NotImplementedError."); #define OS_UTIME_METHODDEF \ - {"utime", (PyCFunction)os_utime, METH_FASTCALL, os_utime__doc__}, + {"utime", (PyCFunction)os_utime, METH_FASTCALL|METH_KEYWORDS, os_utime__doc__}, static PyObject * os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns, @@ -1604,7 +1604,7 @@ PyDoc_STRVAR(os__exit__doc__, "Exit to the system with specified status, without normal exit processing."); #define OS__EXIT_METHODDEF \ - {"_exit", (PyCFunction)os__exit, METH_FASTCALL, os__exit__doc__}, + {"_exit", (PyCFunction)os__exit, METH_FASTCALL|METH_KEYWORDS, os__exit__doc__}, static PyObject * os__exit_impl(PyObject *module, int status); @@ -1647,7 +1647,7 @@ static PyObject * os_execv_impl(PyObject *module, path_t *path, PyObject *argv); static PyObject * -os_execv(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_execv(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; path_t path = PATH_T_INITIALIZE("execv", "path", 0, 0); @@ -1657,10 +1657,6 @@ os_execv(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) path_converter, &path, &argv)) { goto exit; } - - if (!_PyArg_NoStackKeywords("execv", kwnames)) { - goto exit; - } return_value = os_execv_impl(module, &path, argv); exit: @@ -1688,7 +1684,7 @@ PyDoc_STRVAR(os_execve__doc__, " Dictionary of strings mapping to strings."); #define OS_EXECVE_METHODDEF \ - {"execve", (PyCFunction)os_execve, METH_FASTCALL, os_execve__doc__}, + {"execve", (PyCFunction)os_execve, METH_FASTCALL|METH_KEYWORDS, os_execve__doc__}, static PyObject * os_execve_impl(PyObject *module, path_t *path, PyObject *argv, PyObject *env); @@ -1740,7 +1736,7 @@ static PyObject * os_spawnv_impl(PyObject *module, int mode, path_t *path, PyObject *argv); static PyObject * -os_spawnv(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_spawnv(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int mode; @@ -1751,10 +1747,6 @@ os_spawnv(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames &mode, path_converter, &path, &argv)) { goto exit; } - - if (!_PyArg_NoStackKeywords("spawnv", kwnames)) { - goto exit; - } return_value = os_spawnv_impl(module, mode, &path, argv); exit: @@ -1791,7 +1783,7 @@ os_spawnve_impl(PyObject *module, int mode, path_t *path, PyObject *argv, PyObject *env); static PyObject * -os_spawnve(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_spawnve(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int mode; @@ -1803,10 +1795,6 @@ os_spawnve(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwname &mode, path_converter, &path, &argv, &env)) { goto exit; } - - if (!_PyArg_NoStackKeywords("spawnve", kwnames)) { - goto exit; - } return_value = os_spawnve_impl(module, mode, &path, argv, env); exit: @@ -1875,7 +1863,7 @@ PyDoc_STRVAR(os_sched_get_priority_max__doc__, "Get the maximum scheduling priority for policy."); #define OS_SCHED_GET_PRIORITY_MAX_METHODDEF \ - {"sched_get_priority_max", (PyCFunction)os_sched_get_priority_max, METH_FASTCALL, os_sched_get_priority_max__doc__}, + {"sched_get_priority_max", (PyCFunction)os_sched_get_priority_max, METH_FASTCALL|METH_KEYWORDS, os_sched_get_priority_max__doc__}, static PyObject * os_sched_get_priority_max_impl(PyObject *module, int policy); @@ -1909,7 +1897,7 @@ PyDoc_STRVAR(os_sched_get_priority_min__doc__, "Get the minimum scheduling priority for policy."); #define OS_SCHED_GET_PRIORITY_MIN_METHODDEF \ - {"sched_get_priority_min", (PyCFunction)os_sched_get_priority_min, METH_FASTCALL, os_sched_get_priority_min__doc__}, + {"sched_get_priority_min", (PyCFunction)os_sched_get_priority_min, METH_FASTCALL|METH_KEYWORDS, os_sched_get_priority_min__doc__}, static PyObject * os_sched_get_priority_min_impl(PyObject *module, int policy); @@ -2020,7 +2008,7 @@ os_sched_setscheduler_impl(PyObject *module, pid_t pid, int policy, struct sched_param *param); static PyObject * -os_sched_setscheduler(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_sched_setscheduler(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; pid_t pid; @@ -2031,10 +2019,6 @@ os_sched_setscheduler(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObj &pid, &policy, convert_sched_param, ¶m)) { goto exit; } - - if (!_PyArg_NoStackKeywords("sched_setscheduler", kwnames)) { - goto exit; - } return_value = os_sched_setscheduler_impl(module, pid, policy, ¶m); exit: @@ -2096,7 +2080,7 @@ os_sched_setparam_impl(PyObject *module, pid_t pid, struct sched_param *param); static PyObject * -os_sched_setparam(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_sched_setparam(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; pid_t pid; @@ -2106,10 +2090,6 @@ os_sched_setparam(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject &pid, convert_sched_param, ¶m)) { goto exit; } - - if (!_PyArg_NoStackKeywords("sched_setparam", kwnames)) { - goto exit; - } return_value = os_sched_setparam_impl(module, pid, ¶m); exit: @@ -2191,7 +2171,7 @@ static PyObject * os_sched_setaffinity_impl(PyObject *module, pid_t pid, PyObject *mask); static PyObject * -os_sched_setaffinity(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_sched_setaffinity(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; pid_t pid; @@ -2201,10 +2181,6 @@ os_sched_setaffinity(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObje &pid, &mask)) { goto exit; } - - if (!_PyArg_NoStackKeywords("sched_setaffinity", kwnames)) { - goto exit; - } return_value = os_sched_setaffinity_impl(module, pid, mask); exit: @@ -2417,7 +2393,7 @@ PyDoc_STRVAR(os_getpgid__doc__, "Call the system call getpgid(), and return the result."); #define OS_GETPGID_METHODDEF \ - {"getpgid", (PyCFunction)os_getpgid, METH_FASTCALL, os_getpgid__doc__}, + {"getpgid", (PyCFunction)os_getpgid, METH_FASTCALL|METH_KEYWORDS, os_getpgid__doc__}, static PyObject * os_getpgid_impl(PyObject *module, pid_t pid); @@ -2570,7 +2546,7 @@ static PyObject * os_kill_impl(PyObject *module, pid_t pid, Py_ssize_t signal); static PyObject * -os_kill(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_kill(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; pid_t pid; @@ -2580,10 +2556,6 @@ os_kill(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) &pid, &signal)) { goto exit; } - - if (!_PyArg_NoStackKeywords("kill", kwnames)) { - goto exit; - } return_value = os_kill_impl(module, pid, signal); exit: @@ -2607,7 +2579,7 @@ static PyObject * os_killpg_impl(PyObject *module, pid_t pgid, int signal); static PyObject * -os_killpg(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_killpg(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; pid_t pgid; @@ -2617,10 +2589,6 @@ os_killpg(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames &pgid, &signal)) { goto exit; } - - if (!_PyArg_NoStackKeywords("killpg", kwnames)) { - goto exit; - } return_value = os_killpg_impl(module, pgid, signal); exit: @@ -2768,7 +2736,7 @@ static PyObject * os_setreuid_impl(PyObject *module, uid_t ruid, uid_t euid); static PyObject * -os_setreuid(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_setreuid(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; uid_t ruid; @@ -2778,10 +2746,6 @@ os_setreuid(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnam _Py_Uid_Converter, &ruid, _Py_Uid_Converter, &euid)) { goto exit; } - - if (!_PyArg_NoStackKeywords("setreuid", kwnames)) { - goto exit; - } return_value = os_setreuid_impl(module, ruid, euid); exit: @@ -2805,7 +2769,7 @@ static PyObject * os_setregid_impl(PyObject *module, gid_t rgid, gid_t egid); static PyObject * -os_setregid(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_setregid(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; gid_t rgid; @@ -2815,10 +2779,6 @@ os_setregid(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnam _Py_Gid_Converter, &rgid, _Py_Gid_Converter, &egid)) { goto exit; } - - if (!_PyArg_NoStackKeywords("setregid", kwnames)) { - goto exit; - } return_value = os_setregid_impl(module, rgid, egid); exit: @@ -2883,7 +2843,7 @@ PyDoc_STRVAR(os_wait3__doc__, " (pid, status, rusage)"); #define OS_WAIT3_METHODDEF \ - {"wait3", (PyCFunction)os_wait3, METH_FASTCALL, os_wait3__doc__}, + {"wait3", (PyCFunction)os_wait3, METH_FASTCALL|METH_KEYWORDS, os_wait3__doc__}, static PyObject * os_wait3_impl(PyObject *module, int options); @@ -2920,7 +2880,7 @@ PyDoc_STRVAR(os_wait4__doc__, " (pid, status, rusage)"); #define OS_WAIT4_METHODDEF \ - {"wait4", (PyCFunction)os_wait4, METH_FASTCALL, os_wait4__doc__}, + {"wait4", (PyCFunction)os_wait4, METH_FASTCALL|METH_KEYWORDS, os_wait4__doc__}, static PyObject * os_wait4_impl(PyObject *module, pid_t pid, int options); @@ -2972,7 +2932,7 @@ static PyObject * os_waitid_impl(PyObject *module, idtype_t idtype, id_t id, int options); static PyObject * -os_waitid(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_waitid(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; idtype_t idtype; @@ -2983,10 +2943,6 @@ os_waitid(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames &idtype, &id, &options)) { goto exit; } - - if (!_PyArg_NoStackKeywords("waitid", kwnames)) { - goto exit; - } return_value = os_waitid_impl(module, idtype, id, options); exit: @@ -3015,7 +2971,7 @@ static PyObject * os_waitpid_impl(PyObject *module, pid_t pid, int options); static PyObject * -os_waitpid(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_waitpid(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; pid_t pid; @@ -3025,10 +2981,6 @@ os_waitpid(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwname &pid, &options)) { goto exit; } - - if (!_PyArg_NoStackKeywords("waitpid", kwnames)) { - goto exit; - } return_value = os_waitpid_impl(module, pid, options); exit: @@ -3057,7 +3009,7 @@ static PyObject * os_waitpid_impl(PyObject *module, intptr_t pid, int options); static PyObject * -os_waitpid(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_waitpid(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; intptr_t pid; @@ -3067,10 +3019,6 @@ os_waitpid(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwname &pid, &options)) { goto exit; } - - if (!_PyArg_NoStackKeywords("waitpid", kwnames)) { - goto exit; - } return_value = os_waitpid_impl(module, pid, options); exit: @@ -3123,7 +3071,7 @@ PyDoc_STRVAR(os_symlink__doc__, " If it is unavailable, using it will raise a NotImplementedError."); #define OS_SYMLINK_METHODDEF \ - {"symlink", (PyCFunction)os_symlink, METH_FASTCALL, os_symlink__doc__}, + {"symlink", (PyCFunction)os_symlink, METH_FASTCALL|METH_KEYWORDS, os_symlink__doc__}, static PyObject * os_symlink_impl(PyObject *module, path_t *src, path_t *dst, @@ -3251,7 +3199,7 @@ static PyObject * os_setpgid_impl(PyObject *module, pid_t pid, pid_t pgrp); static PyObject * -os_setpgid(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_setpgid(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; pid_t pid; @@ -3261,10 +3209,6 @@ os_setpgid(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwname &pid, &pgrp)) { goto exit; } - - if (!_PyArg_NoStackKeywords("setpgid", kwnames)) { - goto exit; - } return_value = os_setpgid_impl(module, pid, pgrp); exit: @@ -3319,7 +3263,7 @@ static PyObject * os_tcsetpgrp_impl(PyObject *module, int fd, pid_t pgid); static PyObject * -os_tcsetpgrp(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_tcsetpgrp(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int fd; @@ -3329,10 +3273,6 @@ os_tcsetpgrp(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwna &fd, &pgid)) { goto exit; } - - if (!_PyArg_NoStackKeywords("tcsetpgrp", kwnames)) { - goto exit; - } return_value = os_tcsetpgrp_impl(module, fd, pgid); exit: @@ -3353,7 +3293,7 @@ PyDoc_STRVAR(os_open__doc__, " If it is unavailable, using it will raise a NotImplementedError."); #define OS_OPEN_METHODDEF \ - {"open", (PyCFunction)os_open, METH_FASTCALL, os_open__doc__}, + {"open", (PyCFunction)os_open, METH_FASTCALL|METH_KEYWORDS, os_open__doc__}, static int os_open_impl(PyObject *module, path_t *path, int flags, int mode, int dir_fd); @@ -3394,7 +3334,7 @@ PyDoc_STRVAR(os_close__doc__, "Close a file descriptor."); #define OS_CLOSE_METHODDEF \ - {"close", (PyCFunction)os_close, METH_FASTCALL, os_close__doc__}, + {"close", (PyCFunction)os_close, METH_FASTCALL|METH_KEYWORDS, os_close__doc__}, static PyObject * os_close_impl(PyObject *module, int fd); @@ -3430,7 +3370,7 @@ static PyObject * os_closerange_impl(PyObject *module, int fd_low, int fd_high); static PyObject * -os_closerange(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_closerange(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int fd_low; @@ -3440,10 +3380,6 @@ os_closerange(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwn &fd_low, &fd_high)) { goto exit; } - - if (!_PyArg_NoStackKeywords("closerange", kwnames)) { - goto exit; - } return_value = os_closerange_impl(module, fd_low, fd_high); exit: @@ -3489,7 +3425,7 @@ PyDoc_STRVAR(os_dup2__doc__, "Duplicate file descriptor."); #define OS_DUP2_METHODDEF \ - {"dup2", (PyCFunction)os_dup2, METH_FASTCALL, os_dup2__doc__}, + {"dup2", (PyCFunction)os_dup2, METH_FASTCALL|METH_KEYWORDS, os_dup2__doc__}, static PyObject * os_dup2_impl(PyObject *module, int fd, int fd2, int inheritable); @@ -3536,7 +3472,7 @@ static PyObject * os_lockf_impl(PyObject *module, int fd, int command, Py_off_t length); static PyObject * -os_lockf(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_lockf(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int fd; @@ -3547,10 +3483,6 @@ os_lockf(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) &fd, &command, Py_off_t_converter, &length)) { goto exit; } - - if (!_PyArg_NoStackKeywords("lockf", kwnames)) { - goto exit; - } return_value = os_lockf_impl(module, fd, command, length); exit: @@ -3575,7 +3507,7 @@ static Py_off_t os_lseek_impl(PyObject *module, int fd, Py_off_t position, int how); static PyObject * -os_lseek(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_lseek(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int fd; @@ -3587,10 +3519,6 @@ os_lseek(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) &fd, Py_off_t_converter, &position, &how)) { goto exit; } - - if (!_PyArg_NoStackKeywords("lseek", kwnames)) { - goto exit; - } _return_value = os_lseek_impl(module, fd, position, how); if ((_return_value == -1) && PyErr_Occurred()) { goto exit; @@ -3614,7 +3542,7 @@ static PyObject * os_read_impl(PyObject *module, int fd, Py_ssize_t length); static PyObject * -os_read(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_read(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int fd; @@ -3624,10 +3552,6 @@ os_read(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) &fd, &length)) { goto exit; } - - if (!_PyArg_NoStackKeywords("read", kwnames)) { - goto exit; - } return_value = os_read_impl(module, fd, length); exit: @@ -3657,7 +3581,7 @@ static Py_ssize_t os_readv_impl(PyObject *module, int fd, PyObject *buffers); static PyObject * -os_readv(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_readv(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int fd; @@ -3668,10 +3592,6 @@ os_readv(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) &fd, &buffers)) { goto exit; } - - if (!_PyArg_NoStackKeywords("readv", kwnames)) { - goto exit; - } _return_value = os_readv_impl(module, fd, buffers); if ((_return_value == -1) && PyErr_Occurred()) { goto exit; @@ -3702,7 +3622,7 @@ static PyObject * os_pread_impl(PyObject *module, int fd, int length, Py_off_t offset); static PyObject * -os_pread(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_pread(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int fd; @@ -3713,10 +3633,6 @@ os_pread(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) &fd, &length, Py_off_t_converter, &offset)) { goto exit; } - - if (!_PyArg_NoStackKeywords("pread", kwnames)) { - goto exit; - } return_value = os_pread_impl(module, fd, length, offset); exit: @@ -3738,7 +3654,7 @@ static Py_ssize_t os_write_impl(PyObject *module, int fd, Py_buffer *data); static PyObject * -os_write(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_write(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int fd; @@ -3749,10 +3665,6 @@ os_write(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) &fd, &data)) { goto exit; } - - if (!_PyArg_NoStackKeywords("write", kwnames)) { - goto exit; - } _return_value = os_write_impl(module, fd, &data); if ((_return_value == -1) && PyErr_Occurred()) { goto exit; @@ -3778,7 +3690,7 @@ PyDoc_STRVAR(os_fstat__doc__, "Equivalent to os.stat(fd)."); #define OS_FSTAT_METHODDEF \ - {"fstat", (PyCFunction)os_fstat, METH_FASTCALL, os_fstat__doc__}, + {"fstat", (PyCFunction)os_fstat, METH_FASTCALL|METH_KEYWORDS, os_fstat__doc__}, static PyObject * os_fstat_impl(PyObject *module, int fd); @@ -3916,7 +3828,7 @@ static Py_ssize_t os_writev_impl(PyObject *module, int fd, PyObject *buffers); static PyObject * -os_writev(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_writev(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int fd; @@ -3927,10 +3839,6 @@ os_writev(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames &fd, &buffers)) { goto exit; } - - if (!_PyArg_NoStackKeywords("writev", kwnames)) { - goto exit; - } _return_value = os_writev_impl(module, fd, buffers); if ((_return_value == -1) && PyErr_Occurred()) { goto exit; @@ -3962,7 +3870,7 @@ static Py_ssize_t os_pwrite_impl(PyObject *module, int fd, Py_buffer *buffer, Py_off_t offset); static PyObject * -os_pwrite(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_pwrite(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int fd; @@ -3974,10 +3882,6 @@ os_pwrite(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames &fd, &buffer, Py_off_t_converter, &offset)) { goto exit; } - - if (!_PyArg_NoStackKeywords("pwrite", kwnames)) { - goto exit; - } _return_value = os_pwrite_impl(module, fd, &buffer, offset); if ((_return_value == -1) && PyErr_Occurred()) { goto exit; @@ -4009,7 +3913,7 @@ PyDoc_STRVAR(os_mkfifo__doc__, " If it is unavailable, using it will raise a NotImplementedError."); #define OS_MKFIFO_METHODDEF \ - {"mkfifo", (PyCFunction)os_mkfifo, METH_FASTCALL, os_mkfifo__doc__}, + {"mkfifo", (PyCFunction)os_mkfifo, METH_FASTCALL|METH_KEYWORDS, os_mkfifo__doc__}, static PyObject * os_mkfifo_impl(PyObject *module, path_t *path, int mode, int dir_fd); @@ -4060,7 +3964,7 @@ PyDoc_STRVAR(os_mknod__doc__, " If it is unavailable, using it will raise a NotImplementedError."); #define OS_MKNOD_METHODDEF \ - {"mknod", (PyCFunction)os_mknod, METH_FASTCALL, os_mknod__doc__}, + {"mknod", (PyCFunction)os_mknod, METH_FASTCALL|METH_KEYWORDS, os_mknod__doc__}, static PyObject * os_mknod_impl(PyObject *module, path_t *path, int mode, dev_t device, @@ -4179,7 +4083,7 @@ static dev_t os_makedev_impl(PyObject *module, int major, int minor); static PyObject * -os_makedev(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_makedev(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int major; @@ -4190,10 +4094,6 @@ os_makedev(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwname &major, &minor)) { goto exit; } - - if (!_PyArg_NoStackKeywords("makedev", kwnames)) { - goto exit; - } _return_value = os_makedev_impl(module, major, minor); if ((_return_value == (dev_t)-1) && PyErr_Occurred()) { goto exit; @@ -4221,7 +4121,7 @@ static PyObject * os_ftruncate_impl(PyObject *module, int fd, Py_off_t length); static PyObject * -os_ftruncate(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_ftruncate(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int fd; @@ -4231,10 +4131,6 @@ os_ftruncate(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwna &fd, Py_off_t_converter, &length)) { goto exit; } - - if (!_PyArg_NoStackKeywords("ftruncate", kwnames)) { - goto exit; - } return_value = os_ftruncate_impl(module, fd, length); exit: @@ -4255,7 +4151,7 @@ PyDoc_STRVAR(os_truncate__doc__, " If this functionality is unavailable, using it raises an exception."); #define OS_TRUNCATE_METHODDEF \ - {"truncate", (PyCFunction)os_truncate, METH_FASTCALL, os_truncate__doc__}, + {"truncate", (PyCFunction)os_truncate, METH_FASTCALL|METH_KEYWORDS, os_truncate__doc__}, static PyObject * os_truncate_impl(PyObject *module, path_t *path, Py_off_t length); @@ -4303,7 +4199,7 @@ os_posix_fallocate_impl(PyObject *module, int fd, Py_off_t offset, Py_off_t length); static PyObject * -os_posix_fallocate(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_posix_fallocate(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int fd; @@ -4314,10 +4210,6 @@ os_posix_fallocate(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject &fd, Py_off_t_converter, &offset, Py_off_t_converter, &length)) { goto exit; } - - if (!_PyArg_NoStackKeywords("posix_fallocate", kwnames)) { - goto exit; - } return_value = os_posix_fallocate_impl(module, fd, offset, length); exit: @@ -4350,7 +4242,7 @@ os_posix_fadvise_impl(PyObject *module, int fd, Py_off_t offset, Py_off_t length, int advice); static PyObject * -os_posix_fadvise(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_posix_fadvise(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int fd; @@ -4362,10 +4254,6 @@ os_posix_fadvise(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject * &fd, Py_off_t_converter, &offset, Py_off_t_converter, &length, &advice)) { goto exit; } - - if (!_PyArg_NoStackKeywords("posix_fadvise", kwnames)) { - goto exit; - } return_value = os_posix_fadvise_impl(module, fd, offset, length, advice); exit: @@ -4389,7 +4277,7 @@ static PyObject * os_putenv_impl(PyObject *module, PyObject *name, PyObject *value); static PyObject * -os_putenv(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_putenv(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *name; @@ -4399,10 +4287,6 @@ os_putenv(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames &name, &value)) { goto exit; } - - if (!_PyArg_NoStackKeywords("putenv", kwnames)) { - goto exit; - } return_value = os_putenv_impl(module, name, value); exit: @@ -4426,7 +4310,7 @@ static PyObject * os_putenv_impl(PyObject *module, PyObject *name, PyObject *value); static PyObject * -os_putenv(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_putenv(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *name = NULL; @@ -4436,10 +4320,6 @@ os_putenv(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames PyUnicode_FSConverter, &name, PyUnicode_FSConverter, &value)) { goto exit; } - - if (!_PyArg_NoStackKeywords("putenv", kwnames)) { - goto exit; - } return_value = os_putenv_impl(module, name, value); exit: @@ -4562,7 +4442,7 @@ PyDoc_STRVAR(os_WIFCONTINUED__doc__, "job control stop."); #define OS_WIFCONTINUED_METHODDEF \ - {"WIFCONTINUED", (PyCFunction)os_WIFCONTINUED, METH_FASTCALL, os_WIFCONTINUED__doc__}, + {"WIFCONTINUED", (PyCFunction)os_WIFCONTINUED, METH_FASTCALL|METH_KEYWORDS, os_WIFCONTINUED__doc__}, static int os_WIFCONTINUED_impl(PyObject *module, int status); @@ -4601,7 +4481,7 @@ PyDoc_STRVAR(os_WIFSTOPPED__doc__, "Return True if the process returning status was stopped."); #define OS_WIFSTOPPED_METHODDEF \ - {"WIFSTOPPED", (PyCFunction)os_WIFSTOPPED, METH_FASTCALL, os_WIFSTOPPED__doc__}, + {"WIFSTOPPED", (PyCFunction)os_WIFSTOPPED, METH_FASTCALL|METH_KEYWORDS, os_WIFSTOPPED__doc__}, static int os_WIFSTOPPED_impl(PyObject *module, int status); @@ -4640,7 +4520,7 @@ PyDoc_STRVAR(os_WIFSIGNALED__doc__, "Return True if the process returning status was terminated by a signal."); #define OS_WIFSIGNALED_METHODDEF \ - {"WIFSIGNALED", (PyCFunction)os_WIFSIGNALED, METH_FASTCALL, os_WIFSIGNALED__doc__}, + {"WIFSIGNALED", (PyCFunction)os_WIFSIGNALED, METH_FASTCALL|METH_KEYWORDS, os_WIFSIGNALED__doc__}, static int os_WIFSIGNALED_impl(PyObject *module, int status); @@ -4679,7 +4559,7 @@ PyDoc_STRVAR(os_WIFEXITED__doc__, "Return True if the process returning status exited via the exit() system call."); #define OS_WIFEXITED_METHODDEF \ - {"WIFEXITED", (PyCFunction)os_WIFEXITED, METH_FASTCALL, os_WIFEXITED__doc__}, + {"WIFEXITED", (PyCFunction)os_WIFEXITED, METH_FASTCALL|METH_KEYWORDS, os_WIFEXITED__doc__}, static int os_WIFEXITED_impl(PyObject *module, int status); @@ -4718,7 +4598,7 @@ PyDoc_STRVAR(os_WEXITSTATUS__doc__, "Return the process return code from status."); #define OS_WEXITSTATUS_METHODDEF \ - {"WEXITSTATUS", (PyCFunction)os_WEXITSTATUS, METH_FASTCALL, os_WEXITSTATUS__doc__}, + {"WEXITSTATUS", (PyCFunction)os_WEXITSTATUS, METH_FASTCALL|METH_KEYWORDS, os_WEXITSTATUS__doc__}, static int os_WEXITSTATUS_impl(PyObject *module, int status); @@ -4757,7 +4637,7 @@ PyDoc_STRVAR(os_WTERMSIG__doc__, "Return the signal that terminated the process that provided the status value."); #define OS_WTERMSIG_METHODDEF \ - {"WTERMSIG", (PyCFunction)os_WTERMSIG, METH_FASTCALL, os_WTERMSIG__doc__}, + {"WTERMSIG", (PyCFunction)os_WTERMSIG, METH_FASTCALL|METH_KEYWORDS, os_WTERMSIG__doc__}, static int os_WTERMSIG_impl(PyObject *module, int status); @@ -4796,7 +4676,7 @@ PyDoc_STRVAR(os_WSTOPSIG__doc__, "Return the signal that stopped the process that provided the status value."); #define OS_WSTOPSIG_METHODDEF \ - {"WSTOPSIG", (PyCFunction)os_WSTOPSIG, METH_FASTCALL, os_WSTOPSIG__doc__}, + {"WSTOPSIG", (PyCFunction)os_WSTOPSIG, METH_FASTCALL|METH_KEYWORDS, os_WSTOPSIG__doc__}, static int os_WSTOPSIG_impl(PyObject *module, int status); @@ -4872,7 +4752,7 @@ PyDoc_STRVAR(os_statvfs__doc__, " If this functionality is unavailable, using it raises an exception."); #define OS_STATVFS_METHODDEF \ - {"statvfs", (PyCFunction)os_statvfs, METH_FASTCALL, os_statvfs__doc__}, + {"statvfs", (PyCFunction)os_statvfs, METH_FASTCALL|METH_KEYWORDS, os_statvfs__doc__}, static PyObject * os_statvfs_impl(PyObject *module, path_t *path); @@ -4909,7 +4789,7 @@ PyDoc_STRVAR(os__getdiskusage__doc__, "Return disk usage statistics about the given path as a (total, free) tuple."); #define OS__GETDISKUSAGE_METHODDEF \ - {"_getdiskusage", (PyCFunction)os__getdiskusage, METH_FASTCALL, os__getdiskusage__doc__}, + {"_getdiskusage", (PyCFunction)os__getdiskusage, METH_FASTCALL|METH_KEYWORDS, os__getdiskusage__doc__}, static PyObject * os__getdiskusage_impl(PyObject *module, Py_UNICODE *path); @@ -4951,7 +4831,7 @@ static long os_fpathconf_impl(PyObject *module, int fd, int name); static PyObject * -os_fpathconf(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_fpathconf(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int fd; @@ -4962,10 +4842,6 @@ os_fpathconf(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwna &fd, conv_path_confname, &name)) { goto exit; } - - if (!_PyArg_NoStackKeywords("fpathconf", kwnames)) { - goto exit; - } _return_value = os_fpathconf_impl(module, fd, name); if ((_return_value == -1) && PyErr_Occurred()) { goto exit; @@ -4991,7 +4867,7 @@ PyDoc_STRVAR(os_pathconf__doc__, " If this functionality is unavailable, using it raises an exception."); #define OS_PATHCONF_METHODDEF \ - {"pathconf", (PyCFunction)os_pathconf, METH_FASTCALL, os_pathconf__doc__}, + {"pathconf", (PyCFunction)os_pathconf, METH_FASTCALL|METH_KEYWORDS, os_pathconf__doc__}, static long os_pathconf_impl(PyObject *module, path_t *path, int name); @@ -5139,7 +5015,7 @@ PyDoc_STRVAR(os_startfile__doc__, "the underlying Win32 ShellExecute function doesn\'t work if it is."); #define OS_STARTFILE_METHODDEF \ - {"startfile", (PyCFunction)os_startfile, METH_FASTCALL, os_startfile__doc__}, + {"startfile", (PyCFunction)os_startfile, METH_FASTCALL|METH_KEYWORDS, os_startfile__doc__}, static PyObject * os_startfile_impl(PyObject *module, path_t *filepath, Py_UNICODE *operation); @@ -5204,7 +5080,7 @@ PyDoc_STRVAR(os_device_encoding__doc__, "If the device is not a terminal, return None."); #define OS_DEVICE_ENCODING_METHODDEF \ - {"device_encoding", (PyCFunction)os_device_encoding, METH_FASTCALL, os_device_encoding__doc__}, + {"device_encoding", (PyCFunction)os_device_encoding, METH_FASTCALL|METH_KEYWORDS, os_device_encoding__doc__}, static PyObject * os_device_encoding_impl(PyObject *module, int fd); @@ -5242,7 +5118,7 @@ static PyObject * os_setresuid_impl(PyObject *module, uid_t ruid, uid_t euid, uid_t suid); static PyObject * -os_setresuid(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_setresuid(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; uid_t ruid; @@ -5253,10 +5129,6 @@ os_setresuid(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwna _Py_Uid_Converter, &ruid, _Py_Uid_Converter, &euid, _Py_Uid_Converter, &suid)) { goto exit; } - - if (!_PyArg_NoStackKeywords("setresuid", kwnames)) { - goto exit; - } return_value = os_setresuid_impl(module, ruid, euid, suid); exit: @@ -5280,7 +5152,7 @@ static PyObject * os_setresgid_impl(PyObject *module, gid_t rgid, gid_t egid, gid_t sgid); static PyObject * -os_setresgid(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_setresgid(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; gid_t rgid; @@ -5291,10 +5163,6 @@ os_setresgid(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwna _Py_Gid_Converter, &rgid, _Py_Gid_Converter, &egid, _Py_Gid_Converter, &sgid)) { goto exit; } - - if (!_PyArg_NoStackKeywords("setresgid", kwnames)) { - goto exit; - } return_value = os_setresgid_impl(module, rgid, egid, sgid); exit: @@ -5361,7 +5229,7 @@ PyDoc_STRVAR(os_getxattr__doc__, " the link points to."); #define OS_GETXATTR_METHODDEF \ - {"getxattr", (PyCFunction)os_getxattr, METH_FASTCALL, os_getxattr__doc__}, + {"getxattr", (PyCFunction)os_getxattr, METH_FASTCALL|METH_KEYWORDS, os_getxattr__doc__}, static PyObject * os_getxattr_impl(PyObject *module, path_t *path, path_t *attribute, @@ -5409,7 +5277,7 @@ PyDoc_STRVAR(os_setxattr__doc__, " the link points to."); #define OS_SETXATTR_METHODDEF \ - {"setxattr", (PyCFunction)os_setxattr, METH_FASTCALL, os_setxattr__doc__}, + {"setxattr", (PyCFunction)os_setxattr, METH_FASTCALL|METH_KEYWORDS, os_setxattr__doc__}, static PyObject * os_setxattr_impl(PyObject *module, path_t *path, path_t *attribute, @@ -5462,7 +5330,7 @@ PyDoc_STRVAR(os_removexattr__doc__, " the link points to."); #define OS_REMOVEXATTR_METHODDEF \ - {"removexattr", (PyCFunction)os_removexattr, METH_FASTCALL, os_removexattr__doc__}, + {"removexattr", (PyCFunction)os_removexattr, METH_FASTCALL|METH_KEYWORDS, os_removexattr__doc__}, static PyObject * os_removexattr_impl(PyObject *module, path_t *path, path_t *attribute, @@ -5510,7 +5378,7 @@ PyDoc_STRVAR(os_listxattr__doc__, " the link points to."); #define OS_LISTXATTR_METHODDEF \ - {"listxattr", (PyCFunction)os_listxattr, METH_FASTCALL, os_listxattr__doc__}, + {"listxattr", (PyCFunction)os_listxattr, METH_FASTCALL|METH_KEYWORDS, os_listxattr__doc__}, static PyObject * os_listxattr_impl(PyObject *module, path_t *path, int follow_symlinks); @@ -5633,7 +5501,7 @@ static PyObject * os_set_inheritable_impl(PyObject *module, int fd, int inheritable); static PyObject * -os_set_inheritable(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_set_inheritable(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int fd; @@ -5643,10 +5511,6 @@ os_set_inheritable(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject &fd, &inheritable)) { goto exit; } - - if (!_PyArg_NoStackKeywords("set_inheritable", kwnames)) { - goto exit; - } return_value = os_set_inheritable_impl(module, fd, inheritable); exit: @@ -5705,7 +5569,7 @@ os_set_handle_inheritable_impl(PyObject *module, intptr_t handle, int inheritable); static PyObject * -os_set_handle_inheritable(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +os_set_handle_inheritable(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; intptr_t handle; @@ -5715,10 +5579,6 @@ os_set_handle_inheritable(PyObject *module, PyObject **args, Py_ssize_t nargs, P &handle, &inheritable)) { goto exit; } - - if (!_PyArg_NoStackKeywords("set_handle_inheritable", kwnames)) { - goto exit; - } return_value = os_set_handle_inheritable_impl(module, handle, inheritable); exit: @@ -5738,7 +5598,7 @@ PyDoc_STRVAR(os_fspath__doc__, "types raise a TypeError."); #define OS_FSPATH_METHODDEF \ - {"fspath", (PyCFunction)os_fspath, METH_FASTCALL, os_fspath__doc__}, + {"fspath", (PyCFunction)os_fspath, METH_FASTCALL|METH_KEYWORDS, os_fspath__doc__}, static PyObject * os_fspath_impl(PyObject *module, PyObject *path); @@ -5770,7 +5630,7 @@ PyDoc_STRVAR(os_getrandom__doc__, "Obtain a series of random bytes."); #define OS_GETRANDOM_METHODDEF \ - {"getrandom", (PyCFunction)os_getrandom, METH_FASTCALL, os_getrandom__doc__}, + {"getrandom", (PyCFunction)os_getrandom, METH_FASTCALL|METH_KEYWORDS, os_getrandom__doc__}, static PyObject * os_getrandom_impl(PyObject *module, Py_ssize_t size, int flags); @@ -6267,4 +6127,4 @@ exit: #ifndef OS_GETRANDOM_METHODDEF #define OS_GETRANDOM_METHODDEF #endif /* !defined(OS_GETRANDOM_METHODDEF) */ -/*[clinic end generated code: output=f222503f1d1fd002 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=aad3db55309db309 input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/pyexpat.inc b/third_party/python/Modules/clinic/pyexpat.inc index 0cfeb624b..6763825dc 100644 --- a/third_party/python/Modules/clinic/pyexpat.inc +++ b/third_party/python/Modules/clinic/pyexpat.inc @@ -19,7 +19,7 @@ pyexpat_xmlparser_Parse_impl(xmlparseobject *self, PyObject *data, int isfinal); static PyObject * -pyexpat_xmlparser_Parse(xmlparseobject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +pyexpat_xmlparser_Parse(xmlparseobject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *data; @@ -29,10 +29,6 @@ pyexpat_xmlparser_Parse(xmlparseobject *self, PyObject **args, Py_ssize_t nargs, &data, &isfinal)) { goto exit; } - - if (!_PyArg_NoStackKeywords("Parse", kwnames)) { - goto exit; - } return_value = pyexpat_xmlparser_Parse_impl(self, data, isfinal); exit: @@ -129,7 +125,7 @@ pyexpat_xmlparser_ExternalEntityParserCreate_impl(xmlparseobject *self, const char *encoding); static PyObject * -pyexpat_xmlparser_ExternalEntityParserCreate(xmlparseobject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +pyexpat_xmlparser_ExternalEntityParserCreate(xmlparseobject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; const char *context; @@ -139,10 +135,6 @@ pyexpat_xmlparser_ExternalEntityParserCreate(xmlparseobject *self, PyObject **ar &context, &encoding)) { goto exit; } - - if (!_PyArg_NoStackKeywords("ExternalEntityParserCreate", kwnames)) { - goto exit; - } return_value = pyexpat_xmlparser_ExternalEntityParserCreate_impl(self, context, encoding); exit: @@ -200,7 +192,7 @@ static PyObject * pyexpat_xmlparser_UseForeignDTD_impl(xmlparseobject *self, int flag); static PyObject * -pyexpat_xmlparser_UseForeignDTD(xmlparseobject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +pyexpat_xmlparser_UseForeignDTD(xmlparseobject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int flag = 1; @@ -209,10 +201,6 @@ pyexpat_xmlparser_UseForeignDTD(xmlparseobject *self, PyObject **args, Py_ssize_ &flag)) { goto exit; } - - if (!_PyArg_NoStackKeywords("UseForeignDTD", kwnames)) { - goto exit; - } return_value = pyexpat_xmlparser_UseForeignDTD_impl(self, flag); exit: @@ -246,7 +234,7 @@ PyDoc_STRVAR(pyexpat_ParserCreate__doc__, "Return a new XML parser object."); #define PYEXPAT_PARSERCREATE_METHODDEF \ - {"ParserCreate", (PyCFunction)pyexpat_ParserCreate, METH_FASTCALL, pyexpat_ParserCreate__doc__}, + {"ParserCreate", (PyCFunction)pyexpat_ParserCreate, METH_FASTCALL|METH_KEYWORDS, pyexpat_ParserCreate__doc__}, static PyObject * pyexpat_ParserCreate_impl(PyObject *module, const char *encoding, @@ -302,4 +290,4 @@ exit: #ifndef PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF #define PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF #endif /* !defined(PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF) */ -/*[clinic end generated code: output=0548a6b12157e29b input=a9049054013a1b77]*/ +/*[clinic end generated code: output=5d2e355f2b48e6c3 input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/signalmodule.inc b/third_party/python/Modules/clinic/signalmodule.inc index 923b2c76d..1d6dacb47 100644 --- a/third_party/python/Modules/clinic/signalmodule.inc +++ b/third_party/python/Modules/clinic/signalmodule.inc @@ -81,7 +81,7 @@ static PyObject * signal_signal_impl(PyObject *module, int signalnum, PyObject *handler); static PyObject * -signal_signal(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +signal_signal(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int signalnum; @@ -91,10 +91,6 @@ signal_signal(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwn &signalnum, &handler)) { goto exit; } - - if (!_PyArg_NoStackKeywords("signal", kwnames)) { - goto exit; - } return_value = signal_signal_impl(module, signalnum, handler); exit: @@ -152,7 +148,7 @@ static PyObject * signal_siginterrupt_impl(PyObject *module, int signalnum, int flag); static PyObject * -signal_siginterrupt(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +signal_siginterrupt(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int signalnum; @@ -162,10 +158,6 @@ signal_siginterrupt(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObjec &signalnum, &flag)) { goto exit; } - - if (!_PyArg_NoStackKeywords("siginterrupt", kwnames)) { - goto exit; - } return_value = signal_siginterrupt_impl(module, signalnum, flag); exit: @@ -195,7 +187,7 @@ signal_setitimer_impl(PyObject *module, int which, double seconds, double interval); static PyObject * -signal_setitimer(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +signal_setitimer(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int which; @@ -206,10 +198,6 @@ signal_setitimer(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject * &which, &seconds, &interval)) { goto exit; } - - if (!_PyArg_NoStackKeywords("setitimer", kwnames)) { - goto exit; - } return_value = signal_setitimer_impl(module, which, seconds, interval); exit: @@ -264,7 +252,7 @@ static PyObject * signal_pthread_sigmask_impl(PyObject *module, int how, PyObject *mask); static PyObject * -signal_pthread_sigmask(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +signal_pthread_sigmask(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int how; @@ -274,10 +262,6 @@ signal_pthread_sigmask(PyObject *module, PyObject **args, Py_ssize_t nargs, PyOb &how, &mask)) { goto exit; } - - if (!_PyArg_NoStackKeywords("pthread_sigmask", kwnames)) { - goto exit; - } return_value = signal_pthread_sigmask_impl(module, how, mask); exit: @@ -361,7 +345,7 @@ signal_sigtimedwait_impl(PyObject *module, PyObject *sigset, PyObject *timeout_obj); static PyObject * -signal_sigtimedwait(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +signal_sigtimedwait(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *sigset; @@ -372,10 +356,6 @@ signal_sigtimedwait(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObjec &sigset, &timeout_obj)) { goto exit; } - - if (!_PyArg_NoStackKeywords("sigtimedwait", kwnames)) { - goto exit; - } return_value = signal_sigtimedwait_impl(module, sigset, timeout_obj); exit: @@ -399,7 +379,7 @@ static PyObject * signal_pthread_kill_impl(PyObject *module, long thread_id, int signalnum); static PyObject * -signal_pthread_kill(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +signal_pthread_kill(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; long thread_id; @@ -409,10 +389,6 @@ signal_pthread_kill(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObjec &thread_id, &signalnum)) { goto exit; } - - if (!_PyArg_NoStackKeywords("pthread_kill", kwnames)) { - goto exit; - } return_value = signal_pthread_kill_impl(module, thread_id, signalnum); exit: @@ -464,4 +440,4 @@ exit: #ifndef SIGNAL_PTHREAD_KILL_METHODDEF #define SIGNAL_PTHREAD_KILL_METHODDEF #endif /* !defined(SIGNAL_PTHREAD_KILL_METHODDEF) */ -/*[clinic end generated code: output=fab3dba32c058588 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=99ed1ec3156528ba input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/unicodedata.inc b/third_party/python/Modules/clinic/unicodedata.inc index 8f8d59777..1e4565395 100644 --- a/third_party/python/Modules/clinic/unicodedata.inc +++ b/third_party/python/Modules/clinic/unicodedata.inc @@ -21,7 +21,7 @@ unicodedata_UCD_decimal_impl(PyObject *self, int chr, PyObject *default_value); static PyObject * -unicodedata_UCD_decimal(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +unicodedata_UCD_decimal(PyObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int chr; @@ -31,10 +31,6 @@ unicodedata_UCD_decimal(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObj &chr, &default_value)) { goto exit; } - - if (!_PyArg_NoStackKeywords("decimal", kwnames)) { - goto exit; - } return_value = unicodedata_UCD_decimal_impl(self, chr, default_value); exit: @@ -58,7 +54,7 @@ static PyObject * unicodedata_UCD_digit_impl(PyObject *self, int chr, PyObject *default_value); static PyObject * -unicodedata_UCD_digit(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +unicodedata_UCD_digit(PyObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int chr; @@ -68,10 +64,6 @@ unicodedata_UCD_digit(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObjec &chr, &default_value)) { goto exit; } - - if (!_PyArg_NoStackKeywords("digit", kwnames)) { - goto exit; - } return_value = unicodedata_UCD_digit_impl(self, chr, default_value); exit: @@ -96,7 +88,7 @@ unicodedata_UCD_numeric_impl(PyObject *self, int chr, PyObject *default_value); static PyObject * -unicodedata_UCD_numeric(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +unicodedata_UCD_numeric(PyObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int chr; @@ -106,10 +98,6 @@ unicodedata_UCD_numeric(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObj &chr, &default_value)) { goto exit; } - - if (!_PyArg_NoStackKeywords("numeric", kwnames)) { - goto exit; - } return_value = unicodedata_UCD_numeric_impl(self, chr, default_value); exit: @@ -313,7 +301,7 @@ unicodedata_UCD_normalize_impl(PyObject *self, const char *form, PyObject *input); static PyObject * -unicodedata_UCD_normalize(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +unicodedata_UCD_normalize(PyObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; const char *form; @@ -323,10 +311,6 @@ unicodedata_UCD_normalize(PyObject *self, PyObject **args, Py_ssize_t nargs, PyO &form, &PyUnicode_Type, &input)) { goto exit; } - - if (!_PyArg_NoStackKeywords("normalize", kwnames)) { - goto exit; - } return_value = unicodedata_UCD_normalize_impl(self, form, input); exit: @@ -349,7 +333,7 @@ static PyObject * unicodedata_UCD_name_impl(PyObject *self, int chr, PyObject *default_value); static PyObject * -unicodedata_UCD_name(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +unicodedata_UCD_name(PyObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int chr; @@ -359,10 +343,6 @@ unicodedata_UCD_name(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject &chr, &default_value)) { goto exit; } - - if (!_PyArg_NoStackKeywords("name", kwnames)) { - goto exit; - } return_value = unicodedata_UCD_name_impl(self, chr, default_value); exit: @@ -400,4 +380,4 @@ unicodedata_UCD_lookup(PyObject *self, PyObject *arg) exit: return return_value; } -/*[clinic end generated code: output=badeb811d1caec40 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=6778b61d41557af3 input=a9049054013a1b77]*/ diff --git a/third_party/python/Modules/clinic/zlibmodule.inc b/third_party/python/Modules/clinic/zlibmodule.inc index c781f4c47..e72369d6d 100644 --- a/third_party/python/Modules/clinic/zlibmodule.inc +++ b/third_party/python/Modules/clinic/zlibmodule.inc @@ -15,7 +15,7 @@ PyDoc_STRVAR(zlib_compress__doc__, " Compression level, in 0-9 or -1."); #define ZLIB_COMPRESS_METHODDEF \ - {"compress", (PyCFunction)zlib_compress, METH_FASTCALL, zlib_compress__doc__}, + {"compress", (PyCFunction)zlib_compress, METH_FASTCALL|METH_KEYWORDS, zlib_compress__doc__}, static PyObject * zlib_compress_impl(PyObject *module, Py_buffer *data, int level); @@ -58,7 +58,7 @@ PyDoc_STRVAR(zlib_decompress__doc__, " The initial output buffer size."); #define ZLIB_DECOMPRESS_METHODDEF \ - {"decompress", (PyCFunction)zlib_decompress, METH_FASTCALL, zlib_decompress__doc__}, + {"decompress", (PyCFunction)zlib_decompress, METH_FASTCALL|METH_KEYWORDS, zlib_decompress__doc__}, static PyObject * zlib_decompress_impl(PyObject *module, Py_buffer *data, int wbits, @@ -121,7 +121,7 @@ PyDoc_STRVAR(zlib_compressobj__doc__, " containing subsequences that are likely to occur in the input data."); #define ZLIB_COMPRESSOBJ_METHODDEF \ - {"compressobj", (PyCFunction)zlib_compressobj, METH_FASTCALL, zlib_compressobj__doc__}, + {"compressobj", (PyCFunction)zlib_compressobj, METH_FASTCALL|METH_KEYWORDS, zlib_compressobj__doc__}, static PyObject * zlib_compressobj_impl(PyObject *module, int level, int method, int wbits, @@ -168,7 +168,7 @@ PyDoc_STRVAR(zlib_decompressobj__doc__, " dictionary as used by the compressor that produced the input data."); #define ZLIB_DECOMPRESSOBJ_METHODDEF \ - {"decompressobj", (PyCFunction)zlib_decompressobj, METH_FASTCALL, zlib_decompressobj__doc__}, + {"decompressobj", (PyCFunction)zlib_decompressobj, METH_FASTCALL|METH_KEYWORDS, zlib_decompressobj__doc__}, static PyObject * zlib_decompressobj_impl(PyObject *module, int wbits, PyObject *zdict); @@ -249,7 +249,7 @@ PyDoc_STRVAR(zlib_Decompress_decompress__doc__, "Call the flush() method to clear these buffers."); #define ZLIB_DECOMPRESS_DECOMPRESS_METHODDEF \ - {"decompress", (PyCFunction)zlib_Decompress_decompress, METH_FASTCALL, zlib_Decompress_decompress__doc__}, + {"decompress", (PyCFunction)zlib_Decompress_decompress, METH_FASTCALL|METH_KEYWORDS, zlib_Decompress_decompress__doc__}, static PyObject * zlib_Decompress_decompress_impl(compobject *self, Py_buffer *data, @@ -298,7 +298,7 @@ static PyObject * zlib_Compress_flush_impl(compobject *self, int mode); static PyObject * -zlib_Compress_flush(compobject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +zlib_Compress_flush(compobject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int mode = Z_FINISH; @@ -307,10 +307,6 @@ zlib_Compress_flush(compobject *self, PyObject **args, Py_ssize_t nargs, PyObjec &mode)) { goto exit; } - - if (!_PyArg_NoStackKeywords("flush", kwnames)) { - goto exit; - } return_value = zlib_Compress_flush_impl(self, mode); exit: @@ -377,7 +373,7 @@ static PyObject * zlib_Decompress_flush_impl(compobject *self, Py_ssize_t length); static PyObject * -zlib_Decompress_flush(compobject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +zlib_Decompress_flush(compobject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_ssize_t length = DEF_BUF_SIZE; @@ -386,10 +382,6 @@ zlib_Decompress_flush(compobject *self, PyObject **args, Py_ssize_t nargs, PyObj ssize_t_converter, &length)) { goto exit; } - - if (!_PyArg_NoStackKeywords("flush", kwnames)) { - goto exit; - } return_value = zlib_Decompress_flush_impl(self, length); exit: @@ -414,7 +406,7 @@ static PyObject * zlib_adler32_impl(PyObject *module, Py_buffer *data, unsigned int value); static PyObject * -zlib_adler32(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +zlib_adler32(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -424,10 +416,6 @@ zlib_adler32(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwna &data, &value)) { goto exit; } - - if (!_PyArg_NoStackKeywords("adler32", kwnames)) { - goto exit; - } return_value = zlib_adler32_impl(module, &data, value); exit: @@ -457,7 +445,7 @@ static PyObject * zlib_crc32_impl(PyObject *module, Py_buffer *data, unsigned int value); static PyObject * -zlib_crc32(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +zlib_crc32(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer data = {NULL, NULL}; @@ -467,10 +455,6 @@ zlib_crc32(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwname &data, &value)) { goto exit; } - - if (!_PyArg_NoStackKeywords("crc32", kwnames)) { - goto exit; - } return_value = zlib_crc32_impl(module, &data, value); exit: @@ -485,4 +469,4 @@ exit: #ifndef ZLIB_COMPRESS_COPY_METHODDEF #define ZLIB_COMPRESS_COPY_METHODDEF #endif /* !defined(ZLIB_COMPRESS_COPY_METHODDEF) */ -/*[clinic end generated code: output=c6cb10ed66f226b2 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=9fb104ee528088ee input=a9049054013a1b77]*/ diff --git a/third_party/python/Objects/call.c b/third_party/python/Objects/call.c index 002352bd9..b5a5157b5 100644 --- a/third_party/python/Objects/call.c +++ b/third_party/python/Objects/call.c @@ -546,10 +546,20 @@ _PyMethodDef_RawFastCallDict(PyMethodDef *method, PyObject *self, PyObject **arg } case METH_FASTCALL: + { + if (kwargs != NULL && PyDict_GET_SIZE(kwargs) != 0) { + goto no_keyword_error; + } + + result = (*(_PyCFunctionFast)meth) (self, args, nargs); + break; + } + + case METH_FASTCALL | METH_KEYWORDS: { PyObject **stack; PyObject *kwnames; - _PyCFunctionFast fastmeth = (_PyCFunctionFast)meth; + _PyCFunctionFastWithKeywords fastmeth = (_PyCFunctionFastWithKeywords)meth; if (_PyStack_UnpackDict(args, nargs, kwargs, &stack, &kwnames) < 0) { goto exit; @@ -657,21 +667,30 @@ _PyMethodDef_RawFastCallKeywords(PyMethodDef *method, PyObject *self, PyObject * break; case METH_FASTCALL: - /* Fast-path: avoid temporary dict to pass keyword arguments */ - result = ((_PyCFunctionFast)meth) (self, args, nargs, kwnames); + if (nkwargs) { + goto no_keyword_error; + } + result = ((_PyCFunctionFast)meth) (self, args, nargs); break; + case METH_FASTCALL | METH_KEYWORDS: + /* Fast-path: avoid temporary dict to pass keyword arguments */ + result = ((_PyCFunctionFastWithKeywords)meth) (self, args, nargs, kwnames); + break; + + case METH_VARARGS: + if (nkwargs) { + goto no_keyword_error; + } + /* fall through next case */ + case METH_VARARGS | METH_KEYWORDS: { /* Slow-path: create a temporary tuple for positional arguments and a temporary dict for keyword arguments */ PyObject *argtuple; - if (!(flags & METH_KEYWORDS) && nkwargs) { - goto no_keyword_error; - } - argtuple = _PyStack_AsTuple(args, nargs); if (argtuple == NULL) { goto exit; diff --git a/third_party/python/Objects/clinic/bytearrayobject.inc b/third_party/python/Objects/clinic/bytearrayobject.inc index 9fdedd150..aef9f9f1d 100644 --- a/third_party/python/Objects/clinic/bytearrayobject.inc +++ b/third_party/python/Objects/clinic/bytearrayobject.inc @@ -52,7 +52,7 @@ PyDoc_STRVAR(bytearray_translate__doc__, "The remaining characters are mapped through the given translation table."); #define BYTEARRAY_TRANSLATE_METHODDEF \ - {"translate", (PyCFunction)bytearray_translate, METH_FASTCALL, bytearray_translate__doc__}, + {"translate", (PyCFunction)bytearray_translate, METH_FASTCALL|METH_KEYWORDS, bytearray_translate__doc__}, static PyObject * bytearray_translate_impl(PyByteArrayObject *self, PyObject *table, @@ -95,7 +95,7 @@ static PyObject * bytearray_maketrans_impl(Py_buffer *frm, Py_buffer *to); static PyObject * -bytearray_maketrans(void *null, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +bytearray_maketrans(void *null, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer frm = {NULL, NULL}; @@ -105,10 +105,6 @@ bytearray_maketrans(void *null, PyObject **args, Py_ssize_t nargs, PyObject *kwn &frm, &to)) { goto exit; } - - if (!_PyArg_NoStackKeywords("maketrans", kwnames)) { - goto exit; - } return_value = bytearray_maketrans_impl(&frm, &to); exit: @@ -145,7 +141,7 @@ bytearray_replace_impl(PyByteArrayObject *self, Py_buffer *old, Py_buffer *new, Py_ssize_t count); static PyObject * -bytearray_replace(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +bytearray_replace(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer old = {NULL, NULL}; @@ -156,10 +152,6 @@ bytearray_replace(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs, Py &old, &new, &count)) { goto exit; } - - if (!_PyArg_NoStackKeywords("replace", kwnames)) { - goto exit; - } return_value = bytearray_replace_impl(self, &old, &new, count); exit: @@ -190,7 +182,7 @@ PyDoc_STRVAR(bytearray_split__doc__, " -1 (the default value) means no limit."); #define BYTEARRAY_SPLIT_METHODDEF \ - {"split", (PyCFunction)bytearray_split, METH_FASTCALL, bytearray_split__doc__}, + {"split", (PyCFunction)bytearray_split, METH_FASTCALL|METH_KEYWORDS, bytearray_split__doc__}, static PyObject * bytearray_split_impl(PyByteArrayObject *self, PyObject *sep, @@ -265,7 +257,7 @@ PyDoc_STRVAR(bytearray_rsplit__doc__, "Splitting is done starting at the end of the bytearray and working to the front."); #define BYTEARRAY_RSPLIT_METHODDEF \ - {"rsplit", (PyCFunction)bytearray_rsplit, METH_FASTCALL, bytearray_rsplit__doc__}, + {"rsplit", (PyCFunction)bytearray_rsplit, METH_FASTCALL|METH_KEYWORDS, bytearray_rsplit__doc__}, static PyObject * bytearray_rsplit_impl(PyByteArrayObject *self, PyObject *sep, @@ -326,7 +318,7 @@ static PyObject * bytearray_insert_impl(PyByteArrayObject *self, Py_ssize_t index, int item); static PyObject * -bytearray_insert(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +bytearray_insert(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_ssize_t index; @@ -336,10 +328,6 @@ bytearray_insert(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs, PyO &index, _getbytevalue, &item)) { goto exit; } - - if (!_PyArg_NoStackKeywords("insert", kwnames)) { - goto exit; - } return_value = bytearray_insert_impl(self, index, item); exit: @@ -407,7 +395,7 @@ static PyObject * bytearray_pop_impl(PyByteArrayObject *self, Py_ssize_t index); static PyObject * -bytearray_pop(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +bytearray_pop(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_ssize_t index = -1; @@ -416,10 +404,6 @@ bytearray_pop(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs, PyObje &index)) { goto exit; } - - if (!_PyArg_NoStackKeywords("pop", kwnames)) { - goto exit; - } return_value = bytearray_pop_impl(self, index); exit: @@ -471,7 +455,7 @@ static PyObject * bytearray_strip_impl(PyByteArrayObject *self, PyObject *bytes); static PyObject * -bytearray_strip(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +bytearray_strip(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *bytes = Py_None; @@ -481,10 +465,6 @@ bytearray_strip(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs, PyOb &bytes)) { goto exit; } - - if (!_PyArg_NoStackKeywords("strip", kwnames)) { - goto exit; - } return_value = bytearray_strip_impl(self, bytes); exit: @@ -506,7 +486,7 @@ static PyObject * bytearray_lstrip_impl(PyByteArrayObject *self, PyObject *bytes); static PyObject * -bytearray_lstrip(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +bytearray_lstrip(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *bytes = Py_None; @@ -516,10 +496,6 @@ bytearray_lstrip(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs, PyO &bytes)) { goto exit; } - - if (!_PyArg_NoStackKeywords("lstrip", kwnames)) { - goto exit; - } return_value = bytearray_lstrip_impl(self, bytes); exit: @@ -541,7 +517,7 @@ static PyObject * bytearray_rstrip_impl(PyByteArrayObject *self, PyObject *bytes); static PyObject * -bytearray_rstrip(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +bytearray_rstrip(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *bytes = Py_None; @@ -551,10 +527,6 @@ bytearray_rstrip(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs, PyO &bytes)) { goto exit; } - - if (!_PyArg_NoStackKeywords("rstrip", kwnames)) { - goto exit; - } return_value = bytearray_rstrip_impl(self, bytes); exit: @@ -577,7 +549,7 @@ PyDoc_STRVAR(bytearray_decode__doc__, " can handle UnicodeDecodeErrors."); #define BYTEARRAY_DECODE_METHODDEF \ - {"decode", (PyCFunction)bytearray_decode, METH_FASTCALL, bytearray_decode__doc__}, + {"decode", (PyCFunction)bytearray_decode, METH_FASTCALL|METH_KEYWORDS, bytearray_decode__doc__}, static PyObject * bytearray_decode_impl(PyByteArrayObject *self, const char *encoding, @@ -625,7 +597,7 @@ PyDoc_STRVAR(bytearray_splitlines__doc__, "true."); #define BYTEARRAY_SPLITLINES_METHODDEF \ - {"splitlines", (PyCFunction)bytearray_splitlines, METH_FASTCALL, bytearray_splitlines__doc__}, + {"splitlines", (PyCFunction)bytearray_splitlines, METH_FASTCALL|METH_KEYWORDS, bytearray_splitlines__doc__}, static PyObject * bytearray_splitlines_impl(PyByteArrayObject *self, int keepends); @@ -709,7 +681,7 @@ static PyObject * bytearray_reduce_ex_impl(PyByteArrayObject *self, int proto); static PyObject * -bytearray_reduce_ex(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +bytearray_reduce_ex(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; int proto = 0; @@ -718,10 +690,6 @@ bytearray_reduce_ex(PyByteArrayObject *self, PyObject **args, Py_ssize_t nargs, &proto)) { goto exit; } - - if (!_PyArg_NoStackKeywords("__reduce_ex__", kwnames)) { - goto exit; - } return_value = bytearray_reduce_ex_impl(self, proto); exit: @@ -745,4 +713,4 @@ bytearray_sizeof(PyByteArrayObject *self, PyObject *Py_UNUSED(ignored)) { return bytearray_sizeof_impl(self); } -/*[clinic end generated code: output=c1b1b83b0e19df74 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=c2804d009182328c input=a9049054013a1b77]*/ diff --git a/third_party/python/Objects/clinic/bytesobject.inc b/third_party/python/Objects/clinic/bytesobject.inc index 23db67445..635508b6d 100644 --- a/third_party/python/Objects/clinic/bytesobject.inc +++ b/third_party/python/Objects/clinic/bytesobject.inc @@ -18,7 +18,7 @@ PyDoc_STRVAR(bytes_split__doc__, " -1 (the default value) means no limit."); #define BYTES_SPLIT_METHODDEF \ - {"split", (PyCFunction)bytes_split, METH_FASTCALL, bytes_split__doc__}, + {"split", (PyCFunction)bytes_split, METH_FASTCALL|METH_KEYWORDS, bytes_split__doc__}, static PyObject * bytes_split_impl(PyBytesObject *self, PyObject *sep, Py_ssize_t maxsplit); @@ -137,7 +137,7 @@ PyDoc_STRVAR(bytes_rsplit__doc__, "Splitting is done starting at the end of the bytes and working to the front."); #define BYTES_RSPLIT_METHODDEF \ - {"rsplit", (PyCFunction)bytes_rsplit, METH_FASTCALL, bytes_rsplit__doc__}, + {"rsplit", (PyCFunction)bytes_rsplit, METH_FASTCALL|METH_KEYWORDS, bytes_rsplit__doc__}, static PyObject * bytes_rsplit_impl(PyBytesObject *self, PyObject *sep, Py_ssize_t maxsplit); @@ -191,7 +191,7 @@ static PyObject * bytes_strip_impl(PyBytesObject *self, PyObject *bytes); static PyObject * -bytes_strip(PyBytesObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +bytes_strip(PyBytesObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *bytes = Py_None; @@ -201,10 +201,6 @@ bytes_strip(PyBytesObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kw &bytes)) { goto exit; } - - if (!_PyArg_NoStackKeywords("strip", kwnames)) { - goto exit; - } return_value = bytes_strip_impl(self, bytes); exit: @@ -226,7 +222,7 @@ static PyObject * bytes_lstrip_impl(PyBytesObject *self, PyObject *bytes); static PyObject * -bytes_lstrip(PyBytesObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +bytes_lstrip(PyBytesObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *bytes = Py_None; @@ -236,10 +232,6 @@ bytes_lstrip(PyBytesObject *self, PyObject **args, Py_ssize_t nargs, PyObject *k &bytes)) { goto exit; } - - if (!_PyArg_NoStackKeywords("lstrip", kwnames)) { - goto exit; - } return_value = bytes_lstrip_impl(self, bytes); exit: @@ -261,7 +253,7 @@ static PyObject * bytes_rstrip_impl(PyBytesObject *self, PyObject *bytes); static PyObject * -bytes_rstrip(PyBytesObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +bytes_rstrip(PyBytesObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *bytes = Py_None; @@ -271,10 +263,6 @@ bytes_rstrip(PyBytesObject *self, PyObject **args, Py_ssize_t nargs, PyObject *k &bytes)) { goto exit; } - - if (!_PyArg_NoStackKeywords("rstrip", kwnames)) { - goto exit; - } return_value = bytes_rstrip_impl(self, bytes); exit: @@ -294,7 +282,7 @@ PyDoc_STRVAR(bytes_translate__doc__, "The remaining characters are mapped through the given translation table."); #define BYTES_TRANSLATE_METHODDEF \ - {"translate", (PyCFunction)bytes_translate, METH_FASTCALL, bytes_translate__doc__}, + {"translate", (PyCFunction)bytes_translate, METH_FASTCALL|METH_KEYWORDS, bytes_translate__doc__}, static PyObject * bytes_translate_impl(PyBytesObject *self, PyObject *table, @@ -337,7 +325,7 @@ static PyObject * bytes_maketrans_impl(Py_buffer *frm, Py_buffer *to); static PyObject * -bytes_maketrans(void *null, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +bytes_maketrans(void *null, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer frm = {NULL, NULL}; @@ -347,10 +335,6 @@ bytes_maketrans(void *null, PyObject **args, Py_ssize_t nargs, PyObject *kwnames &frm, &to)) { goto exit; } - - if (!_PyArg_NoStackKeywords("maketrans", kwnames)) { - goto exit; - } return_value = bytes_maketrans_impl(&frm, &to); exit: @@ -387,7 +371,7 @@ bytes_replace_impl(PyBytesObject *self, Py_buffer *old, Py_buffer *new, Py_ssize_t count); static PyObject * -bytes_replace(PyBytesObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +bytes_replace(PyBytesObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer old = {NULL, NULL}; @@ -398,10 +382,6 @@ bytes_replace(PyBytesObject *self, PyObject **args, Py_ssize_t nargs, PyObject * &old, &new, &count)) { goto exit; } - - if (!_PyArg_NoStackKeywords("replace", kwnames)) { - goto exit; - } return_value = bytes_replace_impl(self, &old, &new, count); exit: @@ -433,7 +413,7 @@ PyDoc_STRVAR(bytes_decode__doc__, " can handle UnicodeDecodeErrors."); #define BYTES_DECODE_METHODDEF \ - {"decode", (PyCFunction)bytes_decode, METH_FASTCALL, bytes_decode__doc__}, + {"decode", (PyCFunction)bytes_decode, METH_FASTCALL|METH_KEYWORDS, bytes_decode__doc__}, static PyObject * bytes_decode_impl(PyBytesObject *self, const char *encoding, @@ -468,7 +448,7 @@ PyDoc_STRVAR(bytes_splitlines__doc__, "true."); #define BYTES_SPLITLINES_METHODDEF \ - {"splitlines", (PyCFunction)bytes_splitlines, METH_FASTCALL, bytes_splitlines__doc__}, + {"splitlines", (PyCFunction)bytes_splitlines, METH_FASTCALL|METH_KEYWORDS, bytes_splitlines__doc__}, static PyObject * bytes_splitlines_impl(PyBytesObject *self, int keepends); @@ -520,4 +500,4 @@ bytes_fromhex(PyTypeObject *type, PyObject *arg) exit: return return_value; } -/*[clinic end generated code: output=debf785947e0eec2 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=fc9e02359cc56d36 input=a9049054013a1b77]*/ diff --git a/third_party/python/Objects/clinic/dictobject.inc b/third_party/python/Objects/clinic/dictobject.inc index 61be0d9d8..de82f352a 100644 --- a/third_party/python/Objects/clinic/dictobject.inc +++ b/third_party/python/Objects/clinic/dictobject.inc @@ -16,7 +16,7 @@ static PyObject * dict_fromkeys_impl(PyTypeObject *type, PyObject *iterable, PyObject *value); static PyObject * -dict_fromkeys(PyTypeObject *type, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +dict_fromkeys(PyTypeObject *type, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *iterable; @@ -27,10 +27,6 @@ dict_fromkeys(PyTypeObject *type, PyObject **args, Py_ssize_t nargs, PyObject *k &iterable, &value)) { goto exit; } - - if (!_PyArg_NoStackKeywords("fromkeys", kwnames)) { - goto exit; - } return_value = dict_fromkeys_impl(type, iterable, value); exit: @@ -45,4 +41,4 @@ PyDoc_STRVAR(dict___contains____doc__, #define DICT___CONTAINS___METHODDEF \ {"__contains__", (PyCFunction)dict___contains__, METH_O|METH_COEXIST, dict___contains____doc__}, -/*[clinic end generated code: output=69f3d767ed44e8ec input=a9049054013a1b77]*/ +/*[clinic end generated code: output=d6997a57899cf28d input=a9049054013a1b77]*/ diff --git a/third_party/python/Objects/clinic/odictobject.inc b/third_party/python/Objects/clinic/odictobject.inc index 234a5321d..2e4f9d107 100644 --- a/third_party/python/Objects/clinic/odictobject.inc +++ b/third_party/python/Objects/clinic/odictobject.inc @@ -12,7 +12,7 @@ PyDoc_STRVAR(OrderedDict_fromkeys__doc__, "If not specified, the value defaults to None."); #define ORDEREDDICT_FROMKEYS_METHODDEF \ - {"fromkeys", (PyCFunction)OrderedDict_fromkeys, METH_FASTCALL|METH_CLASS, OrderedDict_fromkeys__doc__}, + {"fromkeys", (PyCFunction)OrderedDict_fromkeys, METH_FASTCALL|METH_KEYWORDS|METH_CLASS, OrderedDict_fromkeys__doc__}, static PyObject * OrderedDict_fromkeys_impl(PyTypeObject *type, PyObject *seq, PyObject *value); @@ -43,7 +43,7 @@ PyDoc_STRVAR(OrderedDict_setdefault__doc__, "od.get(k,d), also set od[k]=d if k not in od."); #define ORDEREDDICT_SETDEFAULT_METHODDEF \ - {"setdefault", (PyCFunction)OrderedDict_setdefault, METH_FASTCALL, OrderedDict_setdefault__doc__}, + {"setdefault", (PyCFunction)OrderedDict_setdefault, METH_FASTCALL|METH_KEYWORDS, OrderedDict_setdefault__doc__}, static PyObject * OrderedDict_setdefault_impl(PyODictObject *self, PyObject *key, @@ -77,7 +77,7 @@ PyDoc_STRVAR(OrderedDict_popitem__doc__, "Pairs are returned in LIFO order if last is true or FIFO order if false."); #define ORDEREDDICT_POPITEM_METHODDEF \ - {"popitem", (PyCFunction)OrderedDict_popitem, METH_FASTCALL, OrderedDict_popitem__doc__}, + {"popitem", (PyCFunction)OrderedDict_popitem, METH_FASTCALL|METH_KEYWORDS, OrderedDict_popitem__doc__}, static PyObject * OrderedDict_popitem_impl(PyODictObject *self, int last); @@ -110,7 +110,7 @@ PyDoc_STRVAR(OrderedDict_move_to_end__doc__, " When last=True, acts like a fast version of self[key]=self.pop(key)."); #define ORDEREDDICT_MOVE_TO_END_METHODDEF \ - {"move_to_end", (PyCFunction)OrderedDict_move_to_end, METH_FASTCALL, OrderedDict_move_to_end__doc__}, + {"move_to_end", (PyCFunction)OrderedDict_move_to_end, METH_FASTCALL|METH_KEYWORDS, OrderedDict_move_to_end__doc__}, static PyObject * OrderedDict_move_to_end_impl(PyODictObject *self, PyObject *key, int last); @@ -133,4 +133,4 @@ OrderedDict_move_to_end(PyODictObject *self, PyObject **args, Py_ssize_t nargs, exit: return return_value; } -/*[clinic end generated code: output=f2641e1277045b59 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=b95334dbf48de2dc input=a9049054013a1b77]*/ diff --git a/third_party/python/Objects/clinic/unicodeobject.inc b/third_party/python/Objects/clinic/unicodeobject.inc index 454e31452..45a46e988 100644 --- a/third_party/python/Objects/clinic/unicodeobject.inc +++ b/third_party/python/Objects/clinic/unicodeobject.inc @@ -24,7 +24,7 @@ static PyObject * unicode_maketrans_impl(PyObject *x, PyObject *y, PyObject *z); static PyObject * -unicode_maketrans(void *null, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +unicode_maketrans(void *null, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *x; @@ -35,13 +35,9 @@ unicode_maketrans(void *null, PyObject **args, Py_ssize_t nargs, PyObject *kwnam &x, &y, &z)) { goto exit; } - - if (!_PyArg_NoStackKeywords("maketrans", kwnames)) { - goto exit; - } return_value = unicode_maketrans_impl(x, y, z); exit: return return_value; } -/*[clinic end generated code: output=af4804dbf21463b5 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=d1e48260a99031c2 input=a9049054013a1b77]*/ diff --git a/third_party/python/Objects/dictobject.c b/third_party/python/Objects/dictobject.c index 965e5173e..05490d235 100644 --- a/third_party/python/Objects/dictobject.c +++ b/third_party/python/Objects/dictobject.c @@ -2911,7 +2911,7 @@ dict___contains__(PyDictObject *self, PyObject *key) } static PyObject * -dict_get(PyDictObject *mp, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +dict_get(PyDictObject *mp, PyObject **args, Py_ssize_t nargs) { PyObject *key; PyObject *failobj = Py_None; @@ -2923,9 +2923,6 @@ dict_get(PyDictObject *mp, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) if (!_PyArg_UnpackStack(args, nargs, "get", 1, 2, &key, &failobj)) return NULL; - if (!_PyArg_NoStackKeywords("get", kwnames)) - return NULL; - if (!PyUnicode_CheckExact(key) || (hash = ((PyASCIIObject *) key)->hash) == -1) { hash = PyObject_Hash(key); @@ -3032,7 +3029,7 @@ PyDict_SetDefault(PyObject *d, PyObject *key, PyObject *defaultobj) } static PyObject * -dict_setdefault(PyDictObject *mp, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +dict_setdefault(PyDictObject *mp, PyObject **args, Py_ssize_t nargs) { PyObject *key, *val; PyObject *defaultobj = Py_None; @@ -3040,9 +3037,6 @@ dict_setdefault(PyDictObject *mp, PyObject **args, Py_ssize_t nargs, PyObject *k if (!_PyArg_UnpackStack(args, nargs, "setdefault", 1, 2, &key, &defaultobj)) return NULL; - if(!_PyArg_NoStackKeywords("pop", kwnames)) - return NULL; - val = PyDict_SetDefault((PyObject *)mp, key, defaultobj); Py_XINCREF(val); return val; @@ -3056,16 +3050,13 @@ dict_clear(PyDictObject *mp) } static PyObject * -dict_pop(PyDictObject *mp, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +dict_pop(PyDictObject *mp, PyObject **args, Py_ssize_t nargs) { PyObject *key, *deflt = NULL; if(!_PyArg_UnpackStack(args, nargs, "pop", 1, 2, &key, &deflt)) return NULL; - if(!_PyArg_NoStackKeywords("pop", kwnames)) - return NULL; - return _PyDict_Pop((PyObject*)mp, key, deflt); } diff --git a/third_party/python/Objects/fileobject.c b/third_party/python/Objects/fileobject.c index 516033fbf..c02bbdce1 100644 --- a/third_party/python/Objects/fileobject.c +++ b/third_party/python/Objects/fileobject.c @@ -364,7 +364,7 @@ PyFile_NewStdPrinter(int fd) } static PyObject * -stdprinter_write(PyStdPrinter_Object *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +stdprinter_write(PyStdPrinter_Object *self, PyObject **args, Py_ssize_t nargs) { PyObject *unicode; PyObject *bytes = NULL; @@ -383,9 +383,6 @@ stdprinter_write(PyStdPrinter_Object *self, PyObject **args, Py_ssize_t nargs, P if (!_PyArg_UnpackStack(args, nargs, "write", 1, 1, &unicode)) return NULL; - if(!_PyArg_NoStackKeywords("write", kwnames)) - return NULL; - /* encode Unicode to UTF-8 */ str = PyUnicode_AsUTF8AndSize(unicode, &n); if (str == NULL) { diff --git a/third_party/python/Objects/floatobject.c b/third_party/python/Objects/floatobject.c index 6be701013..8c3f7caf3 100644 --- a/third_party/python/Objects/floatobject.c +++ b/third_party/python/Objects/floatobject.c @@ -1038,7 +1038,7 @@ double_round(double x, int ndigits) { /* round a Python float v to the closest multiple of 10**-ndigits */ static PyObject * -float_round(PyObject *v, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +float_round(PyObject *v, PyObject **args, Py_ssize_t nargs) { double x, rounded; PyObject *o_ndigits = NULL; @@ -1048,9 +1048,6 @@ float_round(PyObject *v, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) if (!_PyArg_UnpackStack(args, nargs, "__round__", 0, 1, &o_ndigits)) return NULL; - if(!_PyArg_NoStackKeywords("__round__", kwnames)) - return NULL; - if (o_ndigits == NULL || o_ndigits == Py_None) { /* single-argument round or with None ndigits: * round to nearest integer */ @@ -1766,7 +1763,7 @@ float_getzero(PyObject *v, void *closure) } static PyObject * -float__format__(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +float__format__(PyObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *format_spec; _PyUnicodeWriter writer; @@ -1775,9 +1772,6 @@ float__format__(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwn if (!_PyArg_ParseStack(args, nargs, "U:__format__", &format_spec)) return NULL; - if(!_PyArg_NoStackKeywords("__format__", kwnames)) - return NULL; - _PyUnicodeWriter_Init(&writer); ret = _PyFloat_FormatAdvancedWriter( &writer, diff --git a/third_party/python/Objects/listobject.c b/third_party/python/Objects/listobject.c index 357e76e77..bb7e83d02 100644 --- a/third_party/python/Objects/listobject.c +++ b/third_party/python/Objects/listobject.c @@ -755,12 +755,11 @@ list_ass_item(PyListObject *a, Py_ssize_t i, PyObject *v) } static PyObject * -listinsert(PyListObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +listinsert(PyListObject *self, PyObject **args, Py_ssize_t nargs) { Py_ssize_t i; PyObject *v; - if (!_PyArg_ParseStack(args, nargs, "nO:insert", &i, &v) - || !_PyArg_NoStackKeywords("insert", kwnames)) + if (!_PyArg_ParseStack(args, nargs, "nO:insert", &i, &v)) return NULL; if (ins1(self, i, v) == 0) Py_RETURN_NONE; @@ -921,14 +920,13 @@ list_inplace_concat(PyListObject *self, PyObject *other) } static PyObject * -listpop(PyListObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +listpop(PyListObject *self, PyObject **args, Py_ssize_t nargs) { Py_ssize_t i = -1; PyObject *v; int status; - if (!_PyArg_ParseStack(args, nargs, "|n:pop", &i) - || !_PyArg_NoStackKeywords("pop", kwnames)) + if (!_PyArg_ParseStack(args, nargs, "|n:pop", &i)) return NULL; if (Py_SIZE(self) == 0) { diff --git a/third_party/python/Objects/longobject.c b/third_party/python/Objects/longobject.c index 141ac4000..543465d3f 100644 --- a/third_party/python/Objects/longobject.c +++ b/third_party/python/Objects/longobject.c @@ -4907,7 +4907,7 @@ long_get1(PyLongObject *v, void *context) { } static PyObject * -long__format__(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +long__format__(PyObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *format_spec; _PyUnicodeWriter writer; @@ -5026,7 +5026,7 @@ _PyLong_DivmodNear(PyObject *a, PyObject *b) } static PyObject * -long_round(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +long_round(PyObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *o_ndigits=NULL, *temp, *result, *ndigits; diff --git a/third_party/python/Objects/typeobject.c b/third_party/python/Objects/typeobject.c index ca2ba0039..8b664b7bf 100644 --- a/third_party/python/Objects/typeobject.c +++ b/third_party/python/Objects/typeobject.c @@ -3345,7 +3345,7 @@ static PyMethodDef type_methods[] = { {"__subclasses__", (PyCFunction)type_subclasses, METH_NOARGS, PyDoc_STR("__subclasses__() -> list of immediate subclasses")}, {"__prepare__", (PyCFunction)type_prepare, - METH_FASTCALL | METH_CLASS, + METH_FASTCALL | METH_KEYWORDS | METH_CLASS, PyDoc_STR("__prepare__() -> dict\n" "used to create the namespace for the class statement")}, {"__instancecheck__", type___instancecheck__, METH_O, diff --git a/third_party/python/Python/bltinmodule.c b/third_party/python/Python/bltinmodule.c index a59c05ea5..95e32c339 100644 --- a/third_party/python/Python/bltinmodule.c +++ b/third_party/python/Python/bltinmodule.c @@ -239,8 +239,7 @@ _Py_IDENTIFIER(stderr); /* AC: cannot convert yet, waiting for *args support */ static PyObject * -builtin___build_class__(PyObject *self, PyObject **args, Py_ssize_t nargs, - PyObject *kwnames) +builtin___build_class__(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *func, *name, *bases, *mkw, *meta, *winner, *prep, *ns; PyObject *cls = NULL, *cell = NULL; @@ -974,14 +973,12 @@ finally: /* AC: cannot convert yet, as needs PEP 457 group support in inspect */ static PyObject * -builtin_dir(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +builtin_dir(PyObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *arg = NULL; if (!_PyArg_UnpackStack(args, nargs, "dir", 0, 1, &arg)) return NULL; - if (!_PyArg_NoStackKeywords("dir", kwnames)) - return NULL; return PyObject_Dir(arg); } @@ -1192,8 +1189,7 @@ builtin_exec_impl(PyObject *module, PyObject *source, PyObject *globals, /* AC: cannot convert yet, as needs PEP 457 group support in inspect */ static PyObject * -builtin_getattr(PyObject *self, PyObject **args, Py_ssize_t nargs, - PyObject *kwnames) +builtin_getattr(PyObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *v, *result, *dflt = NULL; PyObject *name; @@ -1201,10 +1197,6 @@ builtin_getattr(PyObject *self, PyObject **args, Py_ssize_t nargs, if (!_PyArg_UnpackStack(args, nargs, "getattr", 2, 3, &v, &name, &dflt)) return NULL; - if (!_PyArg_NoStackKeywords("getattr", kwnames)) { - return NULL; - } - if (!PyUnicode_Check(name)) { PyErr_SetString(PyExc_TypeError, "getattr(): attribute name must be string"); @@ -1502,8 +1494,7 @@ PyTypeObject PyMap_Type = { /* AC: cannot convert yet, as needs PEP 457 group support in inspect */ static PyObject * -builtin_next(PyObject *self, PyObject **args, Py_ssize_t nargs, - PyObject *kwnames) +builtin_next(PyObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *it, *res; PyObject *def = NULL; @@ -1511,10 +1502,6 @@ builtin_next(PyObject *self, PyObject **args, Py_ssize_t nargs, if (!_PyArg_UnpackStack(args, nargs, "next", 1, 2, &it, &def)) return NULL; - if (!_PyArg_NoStackKeywords("next", kwnames)) { - return NULL; - } - if (!PyIter_Check(it)) { PyErr_Format(PyExc_TypeError, "'%.200s' object is not an iterator", @@ -1643,14 +1630,12 @@ builtin_hex(PyObject *module, PyObject *number) /* AC: cannot convert yet, as needs PEP 457 group support in inspect */ static PyObject * -builtin_iter(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +builtin_iter(PyObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *v, *w = NULL; if (!_PyArg_UnpackStack(args, nargs, "iter", 1, 2, &v, &w)) return NULL; - if(!_PyArg_NoStackKeywords("iter", kwnames)) - return NULL; if (w == NULL) return PyObject_GetIter(v); if (!PyCallable_Check(v)) { @@ -2333,7 +2318,7 @@ PyDoc_STRVAR(builtin_sorted__doc__, "reverse flag can be set to request the result in descending order."); #define BUILTIN_SORTED_METHODDEF \ - {"sorted", (PyCFunction)builtin_sorted, METH_FASTCALL, builtin_sorted__doc__}, + {"sorted", (PyCFunction)builtin_sorted, METH_FASTCALL | METH_KEYWORDS, builtin_sorted__doc__}, static PyObject * builtin_sorted(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) @@ -2372,15 +2357,13 @@ builtin_sorted(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwna /* AC: cannot convert yet, as needs PEP 457 group support in inspect */ static PyObject * -builtin_vars(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +builtin_vars(PyObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *v = NULL; PyObject *d; if (!_PyArg_UnpackStack(args, nargs, "vars", 0, 1, &v)) return NULL; - if(!_PyArg_NoStackKeywords("vars", kwnames)) - return NULL; if (v == NULL) { d = PyEval_GetLocals(); if (d == NULL) @@ -2834,8 +2817,8 @@ PyTypeObject PyZip_Type = { static PyMethodDef builtin_methods[] = { {"__build_class__", (PyCFunction)builtin___build_class__, - METH_FASTCALL, build_class_doc}, - {"__import__", (PyCFunction)builtin___import__, METH_FASTCALL, import_doc}, + METH_FASTCALL | METH_KEYWORDS, build_class_doc}, + {"__import__", (PyCFunction)builtin___import__, METH_FASTCALL | METH_KEYWORDS, import_doc}, BUILTIN_ABS_METHODDEF BUILTIN_ALL_METHODDEF BUILTIN_ANY_METHODDEF @@ -2868,7 +2851,7 @@ static PyMethodDef builtin_methods[] = { BUILTIN_OCT_METHODDEF BUILTIN_ORD_METHODDEF BUILTIN_POW_METHODDEF - {"print", (PyCFunction)builtin_print, METH_FASTCALL, print_doc}, + {"print", (PyCFunction)builtin_print, METH_FASTCALL | METH_KEYWORDS, print_doc}, BUILTIN_REPR_METHODDEF {"round", (PyCFunction)builtin_round, METH_VARARGS | METH_KEYWORDS, round_doc}, BUILTIN_SETATTR_METHODDEF diff --git a/third_party/python/Python/clinic/bltinmodule.inc b/third_party/python/Python/clinic/bltinmodule.inc index 7802250ad..224b5c062 100644 --- a/third_party/python/Python/clinic/bltinmodule.inc +++ b/third_party/python/Python/clinic/bltinmodule.inc @@ -89,7 +89,7 @@ static PyObject * builtin_format_impl(PyObject *module, PyObject *value, PyObject *format_spec); static PyObject * -builtin_format(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +builtin_format(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *value; @@ -99,10 +99,6 @@ builtin_format(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kw &value, &format_spec)) { goto exit; } - - if (!_PyArg_NoStackKeywords("format", kwnames)) { - goto exit; - } return_value = builtin_format_impl(module, value, format_spec); exit: @@ -155,7 +151,7 @@ PyDoc_STRVAR(builtin_compile__doc__, "in addition to any features explicitly specified."); #define BUILTIN_COMPILE_METHODDEF \ - {"compile", (PyCFunction)builtin_compile, METH_FASTCALL, builtin_compile__doc__}, + {"compile", (PyCFunction)builtin_compile, METH_FASTCALL|METH_KEYWORDS, builtin_compile__doc__}, static PyObject * builtin_compile_impl(PyObject *module, PyObject *source, PyObject *filename, @@ -198,7 +194,7 @@ static PyObject * builtin_divmod_impl(PyObject *module, PyObject *x, PyObject *y); static PyObject * -builtin_divmod(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +builtin_divmod(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *x; @@ -209,10 +205,6 @@ builtin_divmod(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kw &x, &y)) { goto exit; } - - if (!_PyArg_NoStackKeywords("divmod", kwnames)) { - goto exit; - } return_value = builtin_divmod_impl(module, x, y); exit: @@ -239,7 +231,7 @@ builtin_eval_impl(PyObject *module, PyObject *source, PyObject *globals, PyObject *locals); static PyObject * -builtin_eval(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +builtin_eval(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *source; @@ -251,10 +243,6 @@ builtin_eval(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwna &source, &globals, &locals)) { goto exit; } - - if (!_PyArg_NoStackKeywords("eval", kwnames)) { - goto exit; - } return_value = builtin_eval_impl(module, source, globals, locals); exit: @@ -281,7 +269,7 @@ builtin_exec_impl(PyObject *module, PyObject *source, PyObject *globals, PyObject *locals); static PyObject * -builtin_exec(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +builtin_exec(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *source; @@ -293,10 +281,6 @@ builtin_exec(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwna &source, &globals, &locals)) { goto exit; } - - if (!_PyArg_NoStackKeywords("exec", kwnames)) { - goto exit; - } return_value = builtin_exec_impl(module, source, globals, locals); exit: @@ -339,7 +323,7 @@ static PyObject * builtin_hasattr_impl(PyObject *module, PyObject *obj, PyObject *name); static PyObject * -builtin_hasattr(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +builtin_hasattr(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *obj; @@ -350,10 +334,6 @@ builtin_hasattr(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *k &obj, &name)) { goto exit; } - - if (!_PyArg_NoStackKeywords("hasattr", kwnames)) { - goto exit; - } return_value = builtin_hasattr_impl(module, obj, name); exit: @@ -388,7 +368,7 @@ builtin_setattr_impl(PyObject *module, PyObject *obj, PyObject *name, PyObject *value); static PyObject * -builtin_setattr(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +builtin_setattr(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *obj; @@ -400,10 +380,6 @@ builtin_setattr(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *k &obj, &name, &value)) { goto exit; } - - if (!_PyArg_NoStackKeywords("setattr", kwnames)) { - goto exit; - } return_value = builtin_setattr_impl(module, obj, name, value); exit: @@ -425,7 +401,7 @@ static PyObject * builtin_delattr_impl(PyObject *module, PyObject *obj, PyObject *name); static PyObject * -builtin_delattr(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +builtin_delattr(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *obj; @@ -436,10 +412,6 @@ builtin_delattr(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *k &obj, &name)) { goto exit; } - - if (!_PyArg_NoStackKeywords("delattr", kwnames)) { - goto exit; - } return_value = builtin_delattr_impl(module, obj, name); exit: @@ -538,7 +510,7 @@ static PyObject * builtin_pow_impl(PyObject *module, PyObject *x, PyObject *y, PyObject *z); static PyObject * -builtin_pow(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +builtin_pow(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *x; @@ -550,10 +522,6 @@ builtin_pow(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnam &x, &y, &z)) { goto exit; } - - if (!_PyArg_NoStackKeywords("pow", kwnames)) { - goto exit; - } return_value = builtin_pow_impl(module, x, y, z); exit: @@ -579,7 +547,7 @@ static PyObject * builtin_input_impl(PyObject *module, PyObject *prompt); static PyObject * -builtin_input(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +builtin_input(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *prompt = NULL; @@ -589,10 +557,6 @@ builtin_input(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwn &prompt)) { goto exit; } - - if (!_PyArg_NoStackKeywords("input", kwnames)) { - goto exit; - } return_value = builtin_input_impl(module, prompt); exit: @@ -627,7 +591,7 @@ static PyObject * builtin_sum_impl(PyObject *module, PyObject *iterable, PyObject *start); static PyObject * -builtin_sum(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +builtin_sum(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *iterable; @@ -638,10 +602,6 @@ builtin_sum(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnam &iterable, &start)) { goto exit; } - - if (!_PyArg_NoStackKeywords("sum", kwnames)) { - goto exit; - } return_value = builtin_sum_impl(module, iterable, start); exit: @@ -666,7 +626,7 @@ builtin_isinstance_impl(PyObject *module, PyObject *obj, PyObject *class_or_tuple); static PyObject * -builtin_isinstance(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +builtin_isinstance(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *obj; @@ -677,10 +637,6 @@ builtin_isinstance(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject &obj, &class_or_tuple)) { goto exit; } - - if (!_PyArg_NoStackKeywords("isinstance", kwnames)) { - goto exit; - } return_value = builtin_isinstance_impl(module, obj, class_or_tuple); exit: @@ -705,7 +661,7 @@ builtin_issubclass_impl(PyObject *module, PyObject *cls, PyObject *class_or_tuple); static PyObject * -builtin_issubclass(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +builtin_issubclass(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *cls; @@ -716,13 +672,9 @@ builtin_issubclass(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject &cls, &class_or_tuple)) { goto exit; } - - if (!_PyArg_NoStackKeywords("issubclass", kwnames)) { - goto exit; - } return_value = builtin_issubclass_impl(module, cls, class_or_tuple); exit: return return_value; } -/*[clinic end generated code: output=17fedd2dec148677 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=09752daa8cdd6ec7 input=a9049054013a1b77]*/ diff --git a/third_party/python/Python/clinic/import.inc b/third_party/python/Python/clinic/import.inc index 9ae2dbff1..b64071b2e 100644 --- a/third_party/python/Python/clinic/import.inc +++ b/third_party/python/Python/clinic/import.inc @@ -83,7 +83,7 @@ _imp__fix_co_filename_impl(PyObject *module, PyCodeObject *code, PyObject *path); static PyObject * -_imp__fix_co_filename(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_imp__fix_co_filename(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyCodeObject *code; @@ -93,10 +93,6 @@ _imp__fix_co_filename(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObj &PyCode_Type, &code, &path)) { goto exit; } - - if (!_PyArg_NoStackKeywords("_fix_co_filename", kwnames)) { - goto exit; - } return_value = _imp__fix_co_filename_impl(module, code, path); exit: @@ -280,7 +276,7 @@ static PyObject * _imp_create_dynamic_impl(PyObject *module, PyObject *spec, PyObject *file); static PyObject * -_imp_create_dynamic(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +_imp_create_dynamic(PyObject *module, PyObject **args, Py_ssize_t nargs) { PyObject *return_value = NULL; PyObject *spec; @@ -291,10 +287,6 @@ _imp_create_dynamic(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObjec &spec, &file)) { goto exit; } - - if (!_PyArg_NoStackKeywords("create_dynamic", kwnames)) { - goto exit; - } return_value = _imp_create_dynamic_impl(module, spec, file); exit: @@ -370,4 +362,4 @@ exit: #ifndef _IMP_EXEC_DYNAMIC_METHODDEF #define _IMP_EXEC_DYNAMIC_METHODDEF #endif /* !defined(_IMP_EXEC_DYNAMIC_METHODDEF) */ -/*[clinic end generated code: output=c1d0e65d04114958 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=d068dd493e513604 input=a9049054013a1b77]*/ diff --git a/third_party/python/Python/marshal.c b/third_party/python/Python/marshal.c index 454c01718..fd6feda8b 100644 --- a/third_party/python/Python/marshal.c +++ b/third_party/python/Python/marshal.c @@ -1688,7 +1688,7 @@ PyMarshal_WriteObjectToString(PyObject *x, int version) /* And an interface for Python programs... */ static PyObject * -marshal_dump(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +marshal_dump(PyObject *self, PyObject **args, Py_ssize_t nargs) { /* XXX Quick hack -- need to do this differently */ PyObject *x; @@ -1700,8 +1700,6 @@ marshal_dump(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwname if (!_PyArg_ParseStack(args, nargs, "OO|i:dump", &x, &f, &version)) return NULL; - if (!_PyArg_NoStackKeywords("dump", kwnames)) - return NULL; s = PyMarshal_WriteObjectToString(x, version); if (s == NULL) @@ -1778,14 +1776,12 @@ dump(), load() will substitute None for the unmarshallable type."); static PyObject * -marshal_dumps(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +marshal_dumps(PyObject *self, PyObject **args, Py_ssize_t nargs) { PyObject *x; int version = Py_MARSHAL_VERSION; if (!_PyArg_ParseStack(args, nargs, "O|i:dumps", &x, &version)) return NULL; - if(!_PyArg_NoStackKeywords("dumps", kwnames)) - return NULL; return PyMarshal_WriteObjectToString(x, version); } @@ -1800,7 +1796,7 @@ The version argument indicates the data format that dumps should use."); static PyObject * -marshal_loads(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames) +marshal_loads(PyObject *self, PyObject **args, Py_ssize_t nargs) { RFILE rf; Py_buffer p; @@ -1809,8 +1805,6 @@ marshal_loads(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnam PyObject* result; if (!_PyArg_ParseStack(args, nargs, "y*:loads", &p)) return NULL; - if(!_PyArg_NoStackKeywords("loads", kwnames)) - return NULL; s = p.buf; n = p.len; rf.fp = NULL;