diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-07-29 01:11:09 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-07-29 01:11:09 (GMT) |
| commit | 2527796a22404d5b8cb0e498a965c6b4a743caac (patch) | |
| tree | 5bc07b91dde0085cc09c3336ed740f6817f11fc3 /Doc/glossary.rst | |
| parent | 1e3a68d36b08cd9d59084a37c8cb6c2d911868ce (diff) | |
| parent | cf534817adc49b2562d175fabd3e3992d25063fe (diff) | |
| download | cpython-2527796a22404d5b8cb0e498a965c6b4a743caac.zip cpython-2527796a22404d5b8cb0e498a965c6b4a743caac.tar.gz cpython-2527796a22404d5b8cb0e498a965c6b4a743caac.tar.bz2 | |
Merge from 3.2 (#10318, #12255, #12043, #12417 and other fixes)
Diffstat (limited to 'Doc/glossary.rst')
| -rw-r--r-- | Doc/glossary.rst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 2961af1..6984bf2 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -431,7 +431,8 @@ Glossary mapping A container object that supports arbitrary key lookups and implements the - methods specified in the :class:`Mapping` or :class:`MutableMapping` + methods specified in the :class:`~collections.Mapping` or + :class:`~collections.MutableMapping` :ref:`abstract base classes <collections-abstract-base-classes>`. Examples include :class:`dict`, :class:`collections.defaultdict`, :class:`collections.OrderedDict` and :class:`collections.Counter`. |