From: Guido van Rossum <guido@python.org>
Date: Wed, 4 Sep 2002 11:29:45 +0000 (+0000)
Subject: In doc strings, use 'k in D' rather than D.has_key(k).
X-Git-Tag: v2.3c1~4216
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=efae8862feed2748e5c892b1d638d1d6344914f2;p=thirdparty%2FPython%2Fcpython.git

In doc strings, use 'k in D' rather than D.has_key(k).
---

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index b7b499ebb9ec..e9726cf74c42 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -1658,10 +1658,10 @@ PyDoc_STRVAR(has_key__doc__,
 "D.has_key(k) -> 1 if D has a key k, else 0");
 
 PyDoc_STRVAR(get__doc__,
-"D.get(k[,d]) -> D[k] if D.has_key(k), else d.  d defaults to None.");
+"D.get(k[,d]) -> D[k] if k in D, else d.  d defaults to None.");
 
 PyDoc_STRVAR(setdefault_doc__,
-"D.setdefault(k[,d]) -> D.get(k,d), also set D[k]=d if not D.has_key(k)");
+"D.setdefault(k[,d]) -> D.get(k,d), also set D[k]=d if k not in D");
 
 PyDoc_STRVAR(pop__doc__,
 "D.pop(k) -> v, remove specified key and return the corresponding value");