From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 21 Oct 2008 22:28:54 +0000 (+0000)
Subject: Merged revisions 66995-66996 via svnmerge from
X-Git-Tag: v2.6.1~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e80861cb7fdde8885196a0883ff6aa6e4ba5ccb;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 66995-66996 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66995 | benjamin.peterson | 2008-10-21 17:18:29 -0500 (Tue, 21 Oct 2008) | 1 line

  return ArgInfo from inspect.getargvalues #4092
........
  r66996 | benjamin.peterson | 2008-10-21 17:20:31 -0500 (Tue, 21 Oct 2008) | 1 line

  add NEWs note for last change
........
---

diff --git a/Lib/inspect.py b/Lib/inspect.py
index 2363826ab151..d3d946d525c1 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -819,7 +819,7 @@ def getargvalues(frame):
     'varargs' and 'varkw' are the names of the * and ** arguments or None.
     'locals' is the locals dictionary of the given frame."""
     args, varargs, varkw = getargs(frame.f_code)
-    return args, varargs, varkw, frame.f_locals
+    return ArgInfo(args, varargs, varkw, frame.f_locals)
 
 def joinseq(seq):
     if len(seq) == 1:
diff --git a/Misc/NEWS b/Misc/NEWS
index 498469367079..c254787c8ef5 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #4092: Return ArgInfo as promised in the documentation from
+  inspect.getargvalues.
+
 - Issue #4014: Don't claim that Python has an Alpha release status, in addition
   to claiming it is Mature.