[Python-checkins] python/dist/src/Objects setobject.c,1.19,1.20

[rhettinger at users.sourceforge.net]

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

Modified Files:
	setobject.c 
Log Message:
Speedup set.update by using the override mode for PyDict_Merge().

Index: setobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/setobject.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** setobject.c	15 Dec 2003 13:23:55 -0000	1.19
--- setobject.c	15 Dec 2003 21:16:06 -0000	1.20
***************
*** 16,20 ****
  
  	if (PyAnySet_Check(other)) {
! 		if (PyDict_Merge(so->data, ((PySetObject *)other)->data, 0) == -1) 
  			return NULL;
  		Py_RETURN_NONE;
--- 16,20 ----
  
  	if (PyAnySet_Check(other)) {
! 		if (PyDict_Merge(so->data, ((PySetObject *)other)->data, 1) == -1) 
  			return NULL;
  		Py_RETURN_NONE;