[Python-checkins] cpython (merge 3.6 -> default): Issue #29292: Merge 3.6.

[xiang.zhang]

https://hg.python.org/cpython/rev/ef1146c95860
changeset:   106242:ef1146c95860
parent:      106239:d9bccaec709d
parent:      106241:bd121b7517ee
user:        Xiang Zhang <angwerzx at 126.com>
date:        Fri Jan 20 11:31:31 2017 +0800
summary:
  Issue #29292: Merge 3.6.

files:
  Doc/c-api/veryhigh.rst |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Doc/c-api/veryhigh.rst b/Doc/c-api/veryhigh.rst
--- a/Doc/c-api/veryhigh.rst
+++ b/Doc/c-api/veryhigh.rst
@@ -300,12 +300,13 @@
    set to *NULL*.
 
 
-.. c:function:: PyObject* PyEval_EvalCodeEx(PyObject *co, PyObject *globals, PyObject *locals, PyObject **args, int argcount, PyObject **kws, int kwcount, PyObject **defs, int defcount, PyObject *closure)
+.. c:function:: PyObject* PyEval_EvalCodeEx(PyObject *co, PyObject *globals, PyObject *locals, PyObject **args, int argcount, PyObject **kws, int kwcount, PyObject **defs, int defcount, PyObject *kwdefs, PyObject *closure)
 
    Evaluate a precompiled code object, given a particular environment for its
    evaluation.  This environment consists of a dictionary of global variables,
    a mapping object of local variables, arrays of arguments, keywords and
-   defaults, and a closure tuple of cells.
+   defaults, a dictionary of default values for :ref:`keyword-only\
+   <keyword-only_parameter>` arguments and a closure tuple of cells.
 
 
 .. c:type:: PyFrameObject

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