[Python-checkins] CVS: python/dist/src/Python ceval.c,2.278,2.279

Tim Peters tim_one@users.sourceforge.net
Sat, 29 Sep 2001 22:58:44 -0700


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

Modified Files:
	ceval.c 
Log Message:
SF bug [#466173] unpack TypeError unclear
Replaced 3 instances of "iter() of non-sequence" with
"iteration over non-sequence".
Restored "unpack non-sequence" for stuff like "a, b = 1".


Index: ceval.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/ceval.c,v
retrieving revision 2.278
retrieving revision 2.279
diff -C2 -d -r2.278 -r2.279
*** ceval.c	2001/09/26 19:24:45	2.278
--- ceval.c	2001/09/30 05:58:42	2.279
***************
*** 1557,1562 ****
  						 stack_pointer + oparg))
  				stack_pointer += oparg;
! 			else
  				why = WHY_EXCEPTION;
  			Py_DECREF(v);
  			break;
--- 1557,1566 ----
  						 stack_pointer + oparg))
  				stack_pointer += oparg;
! 			else {
! 				if (PyErr_ExceptionMatches(PyExc_TypeError))
! 					PyErr_SetString(PyExc_TypeError,
! 						"unpack non-sequence");
  				why = WHY_EXCEPTION;
+ 			}
  			Py_DECREF(v);
  			break;