diff options
| author | Walter Dörwald <walter@livinglogic.de> | 2004-05-28 20:59:21 (GMT) |
|---|---|---|
| committer | Walter Dörwald <walter@livinglogic.de> | 2004-05-28 20:59:21 (GMT) |
| commit | d70ad8a9d9c8212af6d83d2d7d08d21760829b17 (patch) | |
| tree | 555e06669821017f89d41fe927507608085abe0b /Objects | |
| parent | 8759090562103c5f592e987f2864116af99466c5 (diff) | |
| download | cpython-d70ad8a9d9c8212af6d83d2d7d08d21760829b17.zip cpython-d70ad8a9d9c8212af6d83d2d7d08d21760829b17.tar.gz cpython-d70ad8a9d9c8212af6d83d2d7d08d21760829b17.tar.bz2 | |
Update docstring for dict.update() to match the new realities.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/dictobject.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 84cf482..70f05e5 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\ |