diff options
author | Martin Panter <vadmium+py@gmail.com> | 2017-01-11 11:57:18 (GMT) |
---|---|---|
committer | Martin Panter <vadmium+py@gmail.com> | 2017-01-11 11:57:18 (GMT) |
commit | 849b6bd6723c9e6221cb03c6817a818b1e35d6b5 (patch) | |
tree | 0f794cd66dcbb806e7154b25f6af4b458726bb07 /Doc/c-api | |
parent | 8b866d5429c72227a6133d6964b9800a184556fd (diff) | |
parent | a27b3b31927aaaf920d16609cc4470db389e7b67 (diff) | |
download | cpython-849b6bd6723c9e6221cb03c6817a818b1e35d6b5.zip cpython-849b6bd6723c9e6221cb03c6817a818b1e35d6b5.tar.gz cpython-849b6bd6723c9e6221cb03c6817a818b1e35d6b5.tar.bz2 |
Issue #15657: Merge METH_KEYWORDS doc from 3.6
Diffstat (limited to 'Doc/c-api')
-rw-r--r-- | Doc/c-api/structures.rst | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Doc/c-api/structures.rst b/Doc/c-api/structures.rst index 837ac7d..f481193 100644 --- a/Doc/c-api/structures.rst +++ b/Doc/c-api/structures.rst @@ -150,9 +150,8 @@ specific C type of the *self* object. The :attr:`ml_flags` field is a bitfield which can include the following flags. The individual flags indicate either a calling convention or a binding convention. Of the calling convention flags, only :const:`METH_VARARGS` and -:const:`METH_KEYWORDS` can be combined (but note that :const:`METH_KEYWORDS` -alone is equivalent to ``METH_VARARGS | METH_KEYWORDS``). Any of the calling -convention flags can be combined with a binding flag. +:const:`METH_KEYWORDS` can be combined. Any of the calling convention flags +can be combined with a binding flag. .. data:: METH_VARARGS @@ -169,7 +168,7 @@ convention flags can be combined with a binding flag. Methods with these flags must be of type :c:type:`PyCFunctionWithKeywords`. The function expects three parameters: *self*, *args*, and a dictionary of - all the keyword arguments. The flag is typically combined with + all the keyword arguments. The flag must be combined with :const:`METH_VARARGS`, and the parameters are typically processed using :c:func:`PyArg_ParseTupleAndKeywords`. |