diff options
| author | Jeffrey Yasskin <jyasskin@gmail.com> | 2009-05-08 22:23:21 (GMT) |
|---|---|---|
| committer | Jeffrey Yasskin <jyasskin@gmail.com> | 2009-05-08 22:23:21 (GMT) |
| commit | f7f858d1415514cb9a76a5b7da8ee6ccb774e6f4 (patch) | |
| tree | c6bd7974442855ae64181f09fb6b2ccd2cc20b72 /Python | |
| parent | 1aa4700234aa0657ee8cb12cfd9b615fef9e0300 (diff) | |
| download | cpython-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')
| -rw-r--r-- | Python/_warnings.c | 2 | ||||
| -rw-r--r-- | Python/ceval.c | 2 | ||||
| -rw-r--r-- | Python/traceback.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/Python/_warnings.c b/Python/_warnings.c index 1a7c2d5..219cfc6 100644 --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -454,7 +454,7 @@ setup_context(Py_ssize_t stack_level, PyObject **filename, int *lineno, } else { globals = f->f_globals; - *lineno = PyCode_Addr2Line(f->f_code, f->f_lasti); + *lineno = PyFrame_GetLineNumber(f); } *module = NULL; diff --git a/Python/ceval.c b/Python/ceval.c index 88b9d0e..474a885 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -2698,7 +2698,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) default: fprintf(stderr, "XXX lineno: %d, opcode: %d\n", - PyCode_Addr2Line(f->f_code, f->f_lasti), + PyFrame_GetLineNumber(f), opcode); PyErr_SetString(PyExc_SystemError, "unknown opcode"); why = WHY_EXCEPTION; 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; |