tb_here() can now get the lasti and lineno arguments from the frame.

diff --git a/Python/traceback.c b/Python/traceback.c
index f3a1358cf60b58b89535ac91492d77f91a9cc297..bcec4904e20bfd04502a5b25f279562faa9ca3b3 100644 (file)
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -112,13 +112,11 @@ newtracebackobject(next, frame, lasti, lineno)
 static tracebackobject *tb_current = NULL;
 
 int
-tb_here(frame, lasti, lineno)
+tb_here(frame)
        frameobject *frame;
-       int lasti;
-       int lineno;
 {
        tracebackobject *tb;
-       tb = newtracebackobject(tb_current, frame, lasti, lineno);
+       tb = newtracebackobject(tb_current, frame, frame->f_lasti, frame->f_lineno);
        if (tb == NULL)
                return -1;
        XDECREF(tb_current);