[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2.

[georg.brandl]

http://hg.python.org/cpython/rev/e49fdf7d149b
changeset:   74045:e49fdf7d149b
parent:      74043:f30ac7729f2b
parent:      74044:393906d020fe
user:        Georg Brandl <georg at python.org>
date:        Sun Dec 18 19:32:37 2011 +0100
summary:
  Merge with 3.2.

files:
  Objects/dictobject.c |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Objects/dictobject.c b/Objects/dictobject.c
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -1981,9 +1981,9 @@
 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__,

-- 
Repository URL: http://hg.python.org/cpython