[Python-checkins] CVS: python/dist/src/Objects frameobject.c,2.50,2.51

[Tim Peters]

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

Modified Files:
	frameobject.c 
Log Message:
Merging the gen-branch into the main line, at Guido's direction.  Yay!
Bugfix candidate in inspect.py:  it was referencing "self" outside of
a method.


Index: frameobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/frameobject.c,v
retrieving revision 2.50
retrieving revision 2.51
diff -C2 -r2.50 -r2.51
*** frameobject.c	2001/05/08 04:08:20	2.50
--- frameobject.c	2001/06/18 22:08:13	2.51
***************
*** 68,71 ****
--- 68,72 ----
  	int i, slots;
  	PyObject **fastlocals;
+ 	PyObject **p;
  
  	Py_TRASHCAN_SAFE_BEGIN(f)
***************
*** 77,80 ****
--- 78,85 ----
  	}
  
+ 	/* Free stack */
+ 	for (p = f->f_valuestack; p < f->f_stackbottom; p++) {
+ 		Py_XDECREF(*p);
+ 	}
  	Py_XDECREF(f->f_back);
  	Py_XDECREF(f->f_code);
***************
*** 222,225 ****
--- 227,231 ----
  
  	f->f_valuestack = f->f_localsplus + (f->f_nlocals + ncells + nfrees);
+ 	f->f_stackbottom = f->f_valuestack;
  
  	return f;