[Python-checkins] cpython (merge 2.7 -> 2.7): Merge

[antoine.pitrou]

http://hg.python.org/cpython/rev/27bf49316692
changeset:   74053:27bf49316692
branch:      2.7
parent:      74050:64d670a8b183
parent:      74046:d9bb270feb58
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Dec 18 19:31:31 2011 +0100
summary:
  Merge

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
@@ -2167,9 +2167,9 @@
 "D.values() -> list of D's values");
 
 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