summaryrefslogtreecommitdiffstats
path: root/Doc/lib
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2001-04-20 16:50:40 (GMT)
committerGuido van Rossum <guido@python.org>2001-04-20 16:50:40 (GMT)
commit0dbb4fba4c59741466ac18eeb946ca56989717d4 (patch)
treec7c0fe7c20813024cb023075b597fee3c99abd64 /Doc/lib
parent78fe5308b427298a2bb3c80c1d0f6117d18fcf62 (diff)
downloadcpython-0dbb4fba4c59741466ac18eeb946ca56989717d4.zip
cpython-0dbb4fba4c59741466ac18eeb946ca56989717d4.tar.gz
cpython-0dbb4fba4c59741466ac18eeb946ca56989717d4.tar.bz2
Implement, test and document "key in dict" and "key not in dict".
I know some people don't like this -- if it's really controversial, I'll take it out again. (If it's only Alex Martelli who doesn't like it, that doesn't count as "real controversial" though. :-) That's why this is a separate checkin from the iterators stuff I'm about to check in next.
Diffstat (limited to 'Doc/lib')
-rw-r--r--Doc/lib/libstdtypes.tex12
1 files changed, 9 insertions, 3 deletions
diff --git a/Doc/lib/libstdtypes.tex b/Doc/lib/libstdtypes.tex
index 79221b8..f6786a1 100644
--- a/Doc/lib/libstdtypes.tex
+++ b/Doc/lib/libstdtypes.tex
@@ -867,9 +867,15 @@ arbitrary objects):
{(1)}
\lineiii{\var{a}.clear()}{remove all items from \code{a}}{}
\lineiii{\var{a}.copy()}{a (shallow) copy of \code{a}}{}
- \lineiii{\var{a}.has_key(\var{k})}
+ \lineiii{\var{k} \code{in} \var{a}}
{\code{1} if \var{a} has a key \var{k}, else \code{0}}
{}
+ \lineiii{\var{k} not in \var{a}}
+ {\code{0} if \var{a} has a key \var{k}, else \code{1}}
+ {}
+ \lineiii{\var{a}.has_key(\var{k})}
+ {Equivalent to \var{k} \code{in} \var{a}}
+ {}
\lineiii{\var{a}.items()}
{a copy of \var{a}'s list of (\var{key}, \var{value}) pairs}
{(2)}
@@ -879,11 +885,11 @@ arbitrary objects):
{(3)}
\lineiii{\var{a}.values()}{a copy of \var{a}'s list of values}{(2)}
\lineiii{\var{a}.get(\var{k}\optional{, \var{x}})}
- {\code{\var{a}[\var{k}]} if \code{\var{a}.has_key(\var{k})},
+ {\code{\var{a}[\var{k}]} if \code{\var{k} in \var{a}}},
else \var{x}}
{(4)}
\lineiii{\var{a}.setdefault(\var{k}\optional{, \var{x}})}
- {\code{\var{a}[\var{k}]} if \code{\var{a}.has_key(\var{k})},
+ {\code{\var{a}[\var{k}]} if \code{\var{k} in \var{a}}},
else \var{x} (also setting it)}
{(5)}
\lineiii{\var{a}.popitem()}