From: Raymond Hettinger <python@rcn.com>
Date: Sat, 8 Jan 2011 23:50:39 +0000 (+0000)
Subject: Issue 10357: Clarify what it means to be a mapping.
X-Git-Tag: v2.7.2rc1~391
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c4c52dd23d4d365952fb7f653f72f38154e4d331;p=thirdparty%2FPython%2Fcpython.git

Issue 10357: Clarify what it means to be a mapping.
---

diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index d16e359afe5e..eab35f739c96 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -442,9 +442,11 @@ Glossary
       :term:`finder`. See :pep:`302` for details.
 
    mapping
-      A container object (such as :class:`dict`) which supports arbitrary key
-      lookups using the special method :meth:`__getitem__`.  Mappings also
-      support :meth:`__len__`, :meth:`__iter__`, and :meth:`__contains__`.
+      A container object that supports arbitrary key lookups and implements the
+      methods specified in the :class:`Mapping` or :class:`MutableMapping`
+      :ref:`abstract base classes <abstract-base-classes>`. Examples include
+      :class:`dict`, :class:`collections.defaultdict`,
+      :class:`collections.OrderedDict` and :class:`collections.Counter`.
 
    metaclass
       The class of a class.  Class definitions create a class name, a class