Merge 3.5 (issue #25486)

2016-01-11 21:05:18 -05:00 · 2016-01-11 21:05:18 -05:00 · 9179c40a9f
parent 1d37771292 a7c159ddf3
commit 9179c40a9f
1 changed files with 1 additions and 2 deletions
--- 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)