[Python-checkins] r53532 - in python/branches/release25-maint: Misc/NEWS Python/traceback.c

[martin.v.loewis]

Author: martin.v.loewis
Date: Tue Jan 23 22:11:58 2007
New Revision: 53532

Modified:
   python/branches/release25-maint/Misc/NEWS
   python/branches/release25-maint/Python/traceback.c
Log:
Make PyTraceBack_Here use the current thread, not the
frame's thread state. Fixes #1579370.


Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Tue Jan 23 22:11:58 2007
@@ -12,6 +12,9 @@
 Core and builtins
 -----------------
 
+- Bug #1579370: Make PyTraceBack_Here use the current thread, not the
+  frame's thread state.
+
 - patch #1630975: Fix crash when replacing sys.stdout in sitecustomize.py
 
 - Bug #1637022: Prefix AST symbols with _Py_.

Modified: python/branches/release25-maint/Python/traceback.c
==============================================================================
--- python/branches/release25-maint/Python/traceback.c	(original)
+++ python/branches/release25-maint/Python/traceback.c	Tue Jan 23 22:11:58 2007
@@ -113,7 +113,7 @@
 int
 PyTraceBack_Here(PyFrameObject *frame)
 {
-	PyThreadState *tstate = frame->f_tstate;
+	PyThreadState *tstate = PyThreadState_GET();
 	PyTracebackObject *oldtb = (PyTracebackObject *) tstate->curexc_traceback;
 	PyTracebackObject *tb = newtracebackobject(oldtb, frame);
 	if (tb == NULL)