[Python-checkins] CVS: python/dist/src/Objects dictobject.c,2.80.2.9,2.80.2.10

[Guido van Rossum]

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

Modified Files:
      Tag: descr-branch
	dictobject.c 
Log Message:
Ow!  Undo the last change.  It causes infinite recursion in certain
cases and I don't know how to fix that right now.  Later, maybe.


Index: dictobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/dictobject.c,v
retrieving revision 2.80.2.9
retrieving revision 2.80.2.10
diff -C2 -r2.80.2.9 -r2.80.2.10
*** dictobject.c	2001/06/07 11:38:55	2.80.2.9
--- dictobject.c	2001/06/07 11:50:05	2.80.2.10
***************
*** 424,430 ****
  	register int n_used;
  
! 	if (op->ob_type != &PyDict_Type) {
! 		if (PyDict_Check(op))
! 			return PyObject_SetItem(op, key, value);
  		PyErr_BadInternalCall();
  		return -1;
--- 424,428 ----
  	register int n_used;
  
! 	if (!PyDict_Check(op)) {
  		PyErr_BadInternalCall();
  		return -1;
***************
*** 488,494 ****
  	PyObject *old_value, *old_key;
  
! 	if (op->ob_type != &PyDict_Type) {
! 		if (PyDict_Check(op))
! 			return PyObject_DelItem(op, key);
  		PyErr_BadInternalCall();
  		return -1;
--- 486,490 ----
  	PyObject *old_value, *old_key;
  
! 	if (!PyDict_Check(op)) {
  		PyErr_BadInternalCall();
  		return -1;