[Python-checkins] CVS: python/dist/src/Python ceval.c,2.238.2.2,2.238.2.3

Anthony Baxter anthonybaxter@users.sourceforge.net
Sat, 20 Oct 2001 22:57:30 -0700


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

Modified Files:
      Tag: release21-maint
	ceval.c 
Log Message:
Backport fix from 2.277 - incorrectly swapped arguments to PyFrame_BlockSetup.
Fixes very obscure and nasty bug. 



Index: ceval.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/ceval.c,v
retrieving revision 2.238.2.2
retrieving revision 2.238.2.3
diff -C2 -d -r2.238.2.2 -r2.238.2.3
*** ceval.c	2001/06/27 14:13:32	2.238.2.2
--- ceval.c	2001/10/21 05:57:28	2.238.2.3
***************
*** 2197,2202 ****
  				/* For a continue inside a try block,
  				   don't pop the block for the loop. */
! 				PyFrame_BlockSetup(f, b->b_type, b->b_level,
! 						   b->b_handler);
  				why = WHY_NOT;
  				JUMPTO(PyInt_AS_LONG(retval));
--- 2197,2202 ----
  				/* For a continue inside a try block,
  				   don't pop the block for the loop. */
! 				PyFrame_BlockSetup(f, b->b_type, b->b_handler,
! 						   b->b_level);
  				why = WHY_NOT;
  				JUMPTO(PyInt_AS_LONG(retval));