[Python-checkins] cpython (merge 3.4 -> default): Merge: #22918: Drop obsolete mention of 'keys' in datamodel __iter__ docs.

[r.david.murray]

https://hg.python.org/cpython/rev/1a1f577ca647
changeset:   93805:1a1f577ca647
parent:      93800:7d5754af95a9
parent:      93804:743ebaba14db
user:        R David Murray <rdmurray at bitdance.com>
date:        Wed Dec 10 09:51:27 2014 -0500
summary:
  Merge: #22918: Drop obsolete mention of 'keys' in datamodel __iter__ docs.

files:
  Doc/reference/datamodel.rst |  3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)


diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1926,8 +1926,7 @@
 
    This method is called when an iterator is required for a container. This method
    should return a new iterator object that can iterate over all the objects in the
-   container.  For mappings, it should iterate over the keys of the container, and
-   should also be made available as the method :meth:`keys`.
+   container.  For mappings, it should iterate over the keys of the container.
 
    Iterator objects also need to implement this method; they are required to return
    themselves.  For more information on iterator objects, see :ref:`typeiter`.

-- 
Repository URL: https://hg.python.org/cpython