summaryrefslogtreecommitdiffstats
path: root/Lib/inspect.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2014-08-24 14:50:28 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2014-08-24 14:50:28 (GMT)
commitcdcafb78b22ec1cc677abbb2ce292db79279e221 (patch)
treeccf586cfa575fb1f8c67edb6a3ed7ea757bd4a8a /Lib/inspect.py
parent1fa36268cfdac3760de37859aa3ec1b5121248c5 (diff)
downloadcpython-cdcafb78b22ec1cc677abbb2ce292db79279e221.zip
cpython-cdcafb78b22ec1cc677abbb2ce292db79279e221.tar.gz
cpython-cdcafb78b22ec1cc677abbb2ce292db79279e221.tar.bz2
Issue #16808: inspect.stack() now returns a named tuple instead of a tuple.
Patch by Daniel Shahaf.
Diffstat (limited to 'Lib/inspect.py')
-rw-r--r--Lib/inspect.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/inspect.py b/Lib/inspect.py
index da1d4b2..4dd9ab1 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -1312,6 +1312,8 @@ def getlineno(frame):
# FrameType.f_lineno is now a descriptor that grovels co_lnotab
return frame.f_lineno
+FrameInfo = namedtuple('FrameInfo', ('frame',) + Traceback._fields)
+
def getouterframes(frame, context=1):
"""Get a list of records for a frame and all higher (calling) frames.
@@ -1319,7 +1321,8 @@ def getouterframes(frame, context=1):
name, a list of lines of context, and index within the context."""
framelist = []
while frame:
- framelist.append((frame,) + getframeinfo(frame, context))
+ frameinfo = (frame,) + getframeinfo(frame, context)
+ framelist.append(FrameInfo(*frameinfo))
frame = frame.f_back
return framelist
@@ -1330,7 +1333,8 @@ def getinnerframes(tb, context=1):
name, a list of lines of context, and index within the context."""
framelist = []
while tb:
- framelist.append((tb.tb_frame,) + getframeinfo(tb, context))
+ frameinfo = (tb.tb_frame,) + getframeinfo(tb, context)
+ framelist.append(FrameInfo(*frameinfo))
tb = tb.tb_next
return framelist