Phase out has_key usage in the tutorial; correct docs for PyMapping_HasKey*.

diff --git a/Doc/c-api/mapping.rst b/Doc/c-api/mapping.rst
index 2005ce56f90ad1f6ebf3d91b440f148dd4e4f262..cff0759b781f7edde33bc17124a68e17086d3a2b 100644 (file)
--- 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 da9f536461a9a39afe6dbd6da6e552cea623acf3..37fef78f1ce2f061705b9342702279275bf23b45 100644 (file)
--- 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 b6f022c4dc92345945dd24d8c04367f5d1af2159..7ecb049b0f4cb6b0aa0457b8955a592c45682e9d 100644 (file)
--- 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