[Python-checkins] CVS: python/dist/src/Doc/lib libstdtypes.tex,1.52,1.53

[Guido van Rossum]

Update of /cvsroot/python/python/dist/src/Doc/lib
In directory usw-pr-cvs1:/tmp/cvs-serv7993/Doc/lib

Modified Files:
	libstdtypes.tex 
Log Message:
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.



Index: libstdtypes.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/lib/libstdtypes.tex,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** libstdtypes.tex	2001/02/27 03:32:35	1.52
--- libstdtypes.tex	2001/04/20 16:50:40	1.53
***************
*** 868,874 ****
    \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})}
            {\code{1} if \var{a} has a key \var{k}, else \code{0}}
            {}
    \lineiii{\var{a}.items()}
            {a copy of \var{a}'s list of (\var{key}, \var{value}) pairs}
--- 868,880 ----
    \lineiii{\var{a}.clear()}{remove all items from \code{a}}{}
    \lineiii{\var{a}.copy()}{a (shallow) copy of \code{a}}{}
!   \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}
***************
*** 880,888 ****
    \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})},
             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})},
             else \var{x} (also setting it)}
            {(5)}
--- 886,894 ----
    \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{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{k} in \var{a}}},
             else \var{x} (also setting it)}
            {(5)}