summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorYury Selivanov <yselivanov@sprymix.com>2015-10-31 17:29:35 (GMT)
committerYury Selivanov <yselivanov@sprymix.com>2015-10-31 17:29:35 (GMT)
commit05a4a9cbaa252fbf57d77f507c01207c73b5b10f (patch)
tree9ffd2ebe48f9d4a37d3153f0b36b2003c270f62c /Doc
parentff9998839735fe764bac4d19deb3cfd4ef725ba0 (diff)
parentc62162d5fdae577fd4b6706afaefd68551040df2 (diff)
downloadcpython-05a4a9cbaa252fbf57d77f507c01207c73b5b10f.zip
cpython-05a4a9cbaa252fbf57d77f507c01207c73b5b10f.tar.gz
cpython-05a4a9cbaa252fbf57d77f507c01207c73b5b10f.tar.bz2
Merge 3.5
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/inspect.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst
index af0422f..8045d85 100644
--- a/Doc/library/inspect.rst
+++ b/Doc/library/inspect.rst
@@ -88,6 +88,12 @@ attributes:
| | __globals__ | global namespace in which |
| | | this function was defined |
+-----------+-----------------+---------------------------+
+| | __annotations__ | mapping of parameters |
+| | | names to annotations; |
+| | | ``"return"`` key is |
+| | | reserved for return |
+| | | annotations. |
++-----------+-----------------+---------------------------+
| traceback | tb_frame | frame object at this |
| | | level |
+-----------+-----------------+---------------------------+