Merge 3.5

2015-10-31 13:29:35 -04:00 · 2015-10-31 13:29:35 -04:00 · 05a4a9cbaa
parent ff99988397 c62162d5fd
commit 05a4a9cbaa
1 changed files with 6 additions and 0 deletions
--- 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                     |
 +-----------+-----------------+---------------------------+