diff options
author | Georg Brandl <georg@python.org> | 2008-03-28 12:22:12 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2008-03-28 12:22:12 (GMT) |
commit | 8ca6c84b6f8a6cd0c76db8937d471bddb4bf2a1d (patch) | |
tree | 891c59c1df48332b3927d78f0295f19fb9954f81 | |
parent | fc8eef3c78200593c9c70974e48ab859779c607a (diff) | |
download | cpython-8ca6c84b6f8a6cd0c76db8937d471bddb4bf2a1d.zip cpython-8ca6c84b6f8a6cd0c76db8937d471bddb4bf2a1d.tar.gz cpython-8ca6c84b6f8a6cd0c76db8937d471bddb4bf2a1d.tar.bz2 |
Phase out has_key usage in the tutorial; correct docs for PyMapping_HasKey*.
-rw-r--r-- | Doc/c-api/mapping.rst | 10 | ||||
-rw-r--r-- | Doc/library/rfc822.rst | 2 | ||||
-rw-r--r-- | Doc/tutorial/datastructures.rst | 5 |
3 files changed, 7 insertions, 10 deletions
diff --git a/Doc/c-api/mapping.rst b/Doc/c-api/mapping.rst index 2005ce56..cff0759 100644 --- a/Doc/c-api/mapping.rst +++ b/Doc/c-api/mapping.rst @@ -36,15 +36,15 @@ Mapping Protocol .. cfunction:: int PyMapping_HasKeyString(PyObject *o, char *key) On success, return ``1`` if the mapping object has the key *key* and ``0`` - otherwise. This is equivalent to the Python expression ``o.has_key(key)``. - This function always succeeds. + otherwise. This is equivalent to ``o[key]``, returning ``True`` on success + and ``False`` on an exception. This function always succeeds. .. cfunction:: int PyMapping_HasKey(PyObject *o, PyObject *key) - Return ``1`` if the mapping object has the key *key* and ``0`` otherwise. This - is equivalent to the Python expression ``o.has_key(key)``. This function always - succeeds. + Return ``1`` if the mapping object has the key *key* and ``0`` otherwise. + This is equivalent to ``o[key]``, returning ``True`` on success and ``False`` + on an exception. This function always succeeds. .. cfunction:: PyObject* PyMapping_Keys(PyObject *o) diff --git a/Doc/library/rfc822.rst b/Doc/library/rfc822.rst index da9f536..37fef78 100644 --- a/Doc/library/rfc822.rst +++ b/Doc/library/rfc822.rst @@ -260,7 +260,7 @@ A :class:`Message` instance has the following methods: :class:`Message` instances also support a limited mapping interface. In particular: ``m[name]`` is like ``m.getheader(name)`` but raises :exc:`KeyError` if there is no matching header; and ``len(m)``, ``m.get(name[, default])``, -``m.has_key(name)``, ``m.keys()``, ``m.values()`` ``m.items()``, and +``name in m``, ``m.keys()``, ``m.values()`` ``m.items()``, and ``m.setdefault(name[, default])`` act as expected, with the one difference that :meth:`setdefault` uses an empty string as the default value. :class:`Message` instances also support the mapping writable interface ``m[name] diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst index b6f022c..7ecb049 100644 --- a/Doc/tutorial/datastructures.rst +++ b/Doc/tutorial/datastructures.rst @@ -480,8 +480,7 @@ using a non-existent key. The :meth:`keys` method of a dictionary object returns a list of all the keys used in the dictionary, in arbitrary order (if you want it sorted, just apply the :meth:`sort` method to the list of keys). To check whether a single key is -in the dictionary, either use the dictionary's :meth:`has_key` method or the -:keyword:`in` keyword. +in the dictionary, use the :keyword:`in` keyword. Here is a small example using a dictionary:: @@ -497,8 +496,6 @@ Here is a small example using a dictionary:: {'guido': 4127, 'irv': 4127, 'jack': 4098} >>> tel.keys() ['guido', 'irv', 'jack'] - >>> tel.has_key('guido') - True >>> 'guido' in tel True |