summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-05-10 06:44:30 (GMT)
committerBenjamin Peterson <benjamin@python.org>2016-05-10 06:44:30 (GMT)
commita4dfbe608fb52191b435c5545e8a343586887135 (patch)
tree11312b9aad68130fe0f1cc25c1dddbdf07fd5d47 /Doc
parente7041fa2158c1c70e5fecb6c56fc9cef0c275fc6 (diff)
parent387235085c5a6a1d823b0af3fabb42830c88f984 (diff)
downloadcpython-a4dfbe608fb52191b435c5545e8a343586887135.zip
cpython-a4dfbe608fb52191b435c5545e8a343586887135.tar.gz
cpython-a4dfbe608fb52191b435c5545e8a343586887135.tar.bz2
merge 3.5 (#26986)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/c-api/function.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/c-api/function.rst b/Doc/c-api/function.rst
index 4c74dc8..17279c7 100644
--- a/Doc/c-api/function.rst
+++ b/Doc/c-api/function.rst
@@ -34,8 +34,9 @@ There are a few functions specific to Python functions.
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)