[Python-checkins] python/dist/src/Objects dictobject.c,2.159,2.160

[doerwalter at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Objects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12926/Objects

Modified Files:
	dictobject.c 
Log Message:
Update docstring for dict.update() to match the new realities.


Index: dictobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/dictobject.c,v
retrieving revision 2.159
retrieving revision 2.160
diff -C2 -d -r2.159 -r2.160
*** dictobject.c	12 Apr 2004 18:10:01 -0000	2.159
--- dictobject.c	28 May 2004 20:59:21 -0000	2.160
***************
*** 1780,1784 ****
  
  PyDoc_STRVAR(update__doc__,
! "D.update(E) -> None.  Update D from E: for k in E.keys(): D[k] = E[k]");
  
  PyDoc_STRVAR(fromkeys__doc__,
--- 1780,1785 ----
  
  PyDoc_STRVAR(update__doc__,
! "D.update(E, **F) -> None.  Update D from E and F: for k in E: D[k] = E[k]\n\
! (if E has keys else: for (k, v) in E: D[k] = v) then: for k in F: D[k] = F[k]");
  
  PyDoc_STRVAR(fromkeys__doc__,