From 61328eef1fdb8f8bb292e07839be55e917ae4f7a Mon Sep 17 00:00:00 2001 From: Jeffrey Yasskin Date: Mon, 18 May 2009 21:14:54 +0000 Subject: While I was modifying test_trace, it threw an exception when I accidentally made it try to set the line number from the trace callback for a 'call' event. This patch makes the error message a little more helpful in that case, and makes it a little less likely that a future editor will make the same mistake in test_trace. --- Lib/test/test_trace.py | 2 +- Objects/frameobject.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_trace.py b/Lib/test/test_trace.py index b5db9a7..a8f5163 100644 --- a/Lib/test/test_trace.py +++ b/Lib/test/test_trace.py @@ -471,7 +471,7 @@ class JumpTracer: def trace(self, frame, event, arg): if not self.done and frame.f_code == self.function.func_code: firstLine = frame.f_code.co_firstlineno - if frame.f_lineno == firstLine + self.jumpFrom: + if event == 'line' and frame.f_lineno == firstLine + self.jumpFrom: # Cope with non-integer self.jumpTo (because of # no_jump_to_non_integers below). try: diff --git a/Objects/frameobject.c b/Objects/frameobject.c index 7a9d40d..5e54585 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -127,7 +127,8 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno) if (!f->f_trace) { PyErr_Format(PyExc_ValueError, - "f_lineno can only be set by a trace function"); + "f_lineno can only be set by a" + " line trace function"); return -1; } -- cgit v0.12