[Python-checkins] cpython (merge 3.6 -> default): Issue #15657: Merge METH_KEYWORDS doc from 3.6

[martin.panter]

https://hg.python.org/cpython/rev/1058e151049a
changeset:   106090:1058e151049a
parent:      106085:99ad6e871459
parent:      106088:021fd2ff7ca4
user:        Martin Panter <vadmium+py at gmail.com>
date:        Wed Jan 11 11:57:18 2017 +0000
summary:
  Issue #15657: Merge METH_KEYWORDS doc from 3.6

files:
  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
--- a/Doc/c-api/structures.rst
+++ b/Doc/c-api/structures.rst
@@ -150,9 +150,8 @@
 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 @@
 
    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`.
 

-- 
Repository URL: https://hg.python.org/cpython