cpython (merge 3.5 -> default): Merge 3.5

https://hg.python.org/cpython/rev/12e4145fc00b changeset: 98914:12e4145fc00b parent: 98912:0e8743a6924e parent: 98913:d8256ba0914b user: Yury Selivanov <yselivanov@sprymix.com> date: Sat Oct 31 13:29:35 2015 -0400 summary: Merge 3.5 files: Doc/library/inspect.rst | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst --- a/Doc/library/inspect.rst +++ b/Doc/library/inspect.rst @@ -88,6 +88,12 @@ | | __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 | +-----------+-----------------+---------------------------+ -- Repository URL: https://hg.python.org/cpython
participants (1)
-
yury.selivanov