Merge 3.5 (issue #25486)

9179c40a · Yury Selivanov · 1d377712 · a7c159dd · 9179c40a
Commit 9179c40a authored Jan 11, 2016 by Yury Selivanov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

Doc/library/inspect.rst Doc/library/inspect.rst +1 -2

No files found.
--- a/Doc/library/inspect.rst
+++ b/Doc/library/inspect.rst
@@ -810,8 +810,7 @@ Classes and functions
   .. deprecated:: 3.0
      Use :func:`signature` and
      :ref:`Signature Object <inspect-signature-object>`, which provide a
-      better introspecting API for callables.  This function will be removed
-      in Python 3.6.
+      better introspecting API for callables.


 .. function:: getfullargspec(func)