[Python-checkins] cpython (merge 3.5 -> default): merge 3.5 (#26986)

benjamin.peterson python-checkins at python.org
Tue May 10 02:44:36 EDT 2016


https://hg.python.org/cpython/rev/71afeb15f617
changeset:   101285:71afeb15f617
parent:      101283:694dadd9f7bd
parent:      101284:bfc4c57a0986
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon May 09 23:44:30 2016 -0700
summary:
  merge 3.5 (#26986)

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


diff --git a/Doc/c-api/function.rst b/Doc/c-api/function.rst
--- a/Doc/c-api/function.rst
+++ b/Doc/c-api/function.rst
@@ -34,8 +34,9 @@
    Return a new function object associated with the code object *code*. *globals*
    must be a dictionary with the global variables accessible to the function.
 
-   The function's docstring, name and *__module__* are retrieved from the code
-   object, the argument defaults and closure are set to *NULL*.
+   The function's docstring and name are retrieved from the code object. *__module__*
+   is retrieved from *globals*. The argument defaults, annotations and closure are
+   set to *NULL*. *__qualname__* is set to the same value as the function's name.
 
 
 .. c:function:: PyObject* PyFunction_NewWithQualName(PyObject *code, PyObject *globals, PyObject *qualname)

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


More information about the Python-checkins mailing list