[Bug #954364] inspect.getframeinfo() sometimes produces incorrect traceback line #s; fix is to look at tb.tb_lineno, not tb.frame.f_lineno. Patch from Robin Becker and me.
diff --git a/Lib/inspect.py b/Lib/inspect.py
index 0e0e9e5..8a58ce9 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -740,12 +740,14 @@
The optional second argument specifies the number of lines of context
to return, which are centered around the current line."""
if istraceback(frame):
+ lineno = frame.tb_lineno
frame = frame.tb_frame
+ else:
+ lineno = frame.f_lineno
if not isframe(frame):
raise TypeError('arg is not a frame or traceback object')
filename = getsourcefile(frame) or getfile(frame)
- lineno = frame.f_lineno
if context > 0:
start = lineno - 1 - context//2
try: