[Python-checkins] python/dist/src/Python ceval.c,2.301.4.4,2.301.4.5

[mwh@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv1712/src-22x/Python

Modified Files:
      Tag: release22-maint
	ceval.c 
Log Message:
Fix for the recursion_level bug Armin Rigo reported in sf
patch #617312, both on the trunk and the 22-maint branch.

Also added a test case, and ported the test_trace I wrote for HEAD
to 2.2.2 (with all those horrible extra 'line' events ;-).



Index: ceval.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/ceval.c,v
retrieving revision 2.301.4.4
retrieving revision 2.301.4.5
diff -C2 -d -r2.301.4.4 -r2.301.4.5
*** ceval.c	5 Aug 2002 14:46:29 -0000	2.301.4.4
--- ceval.c	2 Oct 2002 13:13:47 -0000	2.301.4.5
***************
*** 613,616 ****
--- 613,618 ----
  				       f, PyTrace_CALL, Py_None)) {
  				/* Trace function raised an error */
+ 				--tstate->recursion_depth;
+ 				tstate->frame = f->f_back;
  				return NULL;
  			}
***************
*** 623,626 ****
--- 625,630 ----
  				       f, PyTrace_CALL, Py_None)) {
  				/* Profile function raised an error */
+ 				--tstate->recursion_depth;
+ 				tstate->frame = f->f_back;
  				return NULL;
  			}