[Python-checkins] r53531 - in python/trunk: Misc/NEWS Python/traceback.c

Tue Jan 23 22:11:48 CET 2007

Author: martin.v.loewis
Date: Tue Jan 23 22:11:47 2007
New Revision: 53531
Modified:
 python/trunk/Misc/NEWS
 python/trunk/Python/traceback.c
Log:
Make PyTraceBack_Here use the current thread, not the
frame's thread state. Fixes #1579370.
Will backport.
Modified: python/trunk/Misc/NEWS
==============================================================================

--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Tue Jan 23 22:11:47 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
 
 - Patch #1507247: tarfile.py: use current umask for intermediate
Modified: python/trunk/Python/traceback.c
==============================================================================
--- python/trunk/Python/traceback.c	(original)
+++ python/trunk/Python/traceback.c	Tue Jan 23 22:11:47 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)
