[Python-checkins] python/dist/src/Python exceptions.c,1.39,1.40

[nnorwitz@users.sourceforge.net]

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

Modified Files:
	exceptions.c 
Log Message:
Two more cases of switch(PySequence_Size()) without checking for case -1.
(Same problem as last checkin for SF bug 610610)
Need to clear the error and proceed.

Backport candidate


Index: exceptions.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/exceptions.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** exceptions.c	18 Sep 2002 04:06:32 -0000	1.39
--- exceptions.c	18 Sep 2002 22:37:17 -0000	1.40
***************
*** 420,423 ****
--- 420,426 ----
          code = PySequence_GetItem(args, 0);
          break;
+     case -1:
+         PyErr_Clear();
+         /* Fall through */
      default:
          Py_INCREF(args);
***************
*** 522,525 ****
--- 525,532 ----
  	    goto finally;
  	}
+ 	break;
+ 
+     case -1:
+ 	PyErr_Clear();
  	break;
      }