From: Walter Dörwald <walter@livinglogic.de>
Date: Fri, 28 May 2004 20:59:21 +0000 (+0000)
Subject: Update docstring for dict.update() to match the new realities.
X-Git-Tag: v2.4a1~336
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d70ad8a9d9c8212af6d83d2d7d08d21760829b17;p=python

Update docstring for dict.update() to match the new realities.
---

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 84cf4826d2..70f05e5def 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -1779,7 +1779,8 @@ PyDoc_STRVAR(values__doc__,
 "D.values() -> list of D's values");
 
 PyDoc_STRVAR(update__doc__,
-"D.update(E) -> None.  Update D from E: for k in E.keys(): D[k] = E[k]");
+"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__,
 "dict.fromkeys(S[,v]) -> New dict with keys from S and values equal to v.\n\