From: Georg Brandl <georg@python.org>
Date: Sun, 18 Dec 2011 18:30:55 +0000 (+0100)
Subject: Small clarification in docstring of dict.update(): the positional argument is not... 
X-Git-Tag: v3.2.3rc1~270^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac0675cc013dffd260c65f07760faa9f38047de9;p=thirdparty%2FPython%2Fcpython.git

Small clarification in docstring of dict.update(): the positional argument is not required.
---

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 79894e560497..768351e224a7 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__,