diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-12-18 18:31:02 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-12-18 18:31:02 (GMT) |
| commit | 92ed3877b471e5e285b5e76b6f13547e579daaa4 (patch) | |
| tree | 50d74bb5581e641444a3a0b005db14e63d87d7af /Objects/dictobject.c | |
| parent | a74252633f2d86b3108b80c929583abd4193d7be (diff) | |
| parent | ac0675cc013dffd260c65f07760faa9f38047de9 (diff) | |
| download | cpython-92ed3877b471e5e285b5e76b6f13547e579daaa4.zip cpython-92ed3877b471e5e285b5e76b6f13547e579daaa4.tar.gz cpython-92ed3877b471e5e285b5e76b6f13547e579daaa4.tar.bz2 | |
Merge
Diffstat (limited to 'Objects/dictobject.c')
| -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 79894e5..768351e 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1973,9 +1973,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__, |