summaryrefslogtreecommitdiffstats
path: root/Python/traceback.c
diff options
context:
space:
mode:
authorJeffrey Yasskin <jyasskin@gmail.com>2009-05-08 22:23:21 (GMT)
committerJeffrey Yasskin <jyasskin@gmail.com>2009-05-08 22:23:21 (GMT)
commitf7f858d1415514cb9a76a5b7da8ee6ccb774e6f4 (patch)
treec6bd7974442855ae64181f09fb6b2ccd2cc20b72 /Python/traceback.c
parent1aa4700234aa0657ee8cb12cfd9b615fef9e0300 (diff)
downloadcpython-f7f858d1415514cb9a76a5b7da8ee6ccb774e6f4.zip
cpython-f7f858d1415514cb9a76a5b7da8ee6ccb774e6f4.tar.gz
cpython-f7f858d1415514cb9a76a5b7da8ee6ccb774e6f4.tar.bz2
Issue 5954, PyFrame_GetLineNumber:
Most uses of PyCode_Addr2Line (http://www.google.com/codesearch?q=PyCode_Addr2Line) are just trying to get the line number of a specified frame, but there's no way to do that directly. Forcing people to go through the code object makes them know more about the guts of the interpreter than they should need. The remaining uses of PyCode_Addr2Line seem to be getting the line from a traceback (for example, http://www.google.com/codesearch/p?hl=en#u_9_nDrchrw/pygame-1.7.1release/src/base.c&q=PyCode_Addr2Line), which is replaced by the tb_lineno field. So we may be able to deprecate PyCode_Addr2Line entirely for external use.
Diffstat (limited to 'Python/traceback.c')
-rw-r--r--Python/traceback.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/Python/traceback.c b/Python/traceback.c
index c2d7e77..1c26ba2 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -96,8 +96,7 @@ newtracebackobject(PyTracebackObject *next, PyFrameObject *frame)
Py_XINCREF(frame);
tb->tb_frame = frame;
tb->tb_lasti = frame->f_lasti;
- tb->tb_lineno = PyCode_Addr2Line(frame->f_code,
- frame->f_lasti);
+ tb->tb_lineno = PyFrame_GetLineNumber(frame);
PyObject_GC_Track(tb);
}
return tb;