diff options
| author | Georg Brandl <georg@python.org> | 2011-12-18 18:32:37 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2011-12-18 18:32:37 (GMT) |
| commit | f928b5d27ecd6edd3adb0b8a455dce657ffa2e34 (patch) | |
| tree | fdc81a510c01e26c2d9c19847e523d17a5552fc6 | |
| parent | 0d81c1357d4b628a29a8f7e33e49782b50f1163a (diff) | |
| parent | ac0675cc013dffd260c65f07760faa9f38047de9 (diff) | |
| download | cpython-f928b5d27ecd6edd3adb0b8a455dce657ffa2e34.zip cpython-f928b5d27ecd6edd3adb0b8a455dce657ffa2e34.tar.gz cpython-f928b5d27ecd6edd3adb0b8a455dce657ffa2e34.tar.bz2 | |
Merge with 3.2.
| -rw-r--r-- | Objects/dictobject.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c index f8f072d..b799a0a 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1981,9 +1981,9 @@ PyDoc_STRVAR(popitem__doc__, 2-tuple; but raise KeyError if D is empty."); PyDoc_STRVAR(update__doc__, -"D.update(E, **F) -> None. Update D from dict/iterable E and F.\n" -"If E has a .keys() method, does: for k in E: D[k] = E[k]\n\ -If E lacks .keys() method, does: for (k, v) in E: D[k] = v\n\ +"D.update([E, ]**F) -> None. Update D from dict/iterable E and F.\n" +"If E present and has a .keys() method, does: for k in E: D[k] = E[k]\n\ +If E present and lacks .keys() method, does: for (k, v) in E: D[k] = v\n\ In either case, this is followed by: for k in F: D[k] = F[k]"); PyDoc_STRVAR(fromkeys__doc__, |