[Python-checkins] python/dist/src/Python ceval.c,2.314,2.315

[jhylton@users.sourceforge.net]

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

Modified Files:
	ceval.c 
Log Message:
Don't stomp on an exception set by PyCell_Get()


Index: ceval.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/ceval.c,v
retrieving revision 2.314
retrieving revision 2.315
diff -C2 -d -r2.314 -r2.315
*** ceval.c	14 Jun 2002 13:53:29 -0000	2.314
--- ceval.c	11 Jul 2002 16:56:38 -0000	2.315
***************
*** 1735,1738 ****
--- 1735,1742 ----
  			w = PyCell_Get(x);
  			if (w == NULL) {
+ 				err = -1;
+ 				/* Don't stomp existing exception */
+ 				if (PyErr_Occurred())
+ 					break;
  				if (oparg < f->f_ncells) {
  					v = PyTuple_GetItem(co->co_cellvars,
***************
*** 1751,1755 ****
  					       v);
  				}
- 				err = -1;
  				break;
  			}
--- 1755,1758 ----