diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-06-04 19:16:42 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-06-04 19:16:42 (GMT) |
| commit | 459b452b9817a3dc16036bf09b0f2d910f4f331d (patch) | |
| tree | 0b2d507c3ce50ae4f28f5092553a39814d7f6681 /Doc/glossary.rst | |
| parent | b4ef8f299f9e50c872026eac00243f75fcf24aa2 (diff) | |
| parent | 70798be6f65029f5a37b34db83512460aa88813c (diff) | |
| download | cpython-459b452b9817a3dc16036bf09b0f2d910f4f331d.zip cpython-459b452b9817a3dc16036bf09b0f2d910f4f331d.tar.gz cpython-459b452b9817a3dc16036bf09b0f2d910f4f331d.tar.bz2 | |
Merge ABC and distutils touch-ups from 3.2.
I have removed the reST target I added in 38cdca2cc253: it is not necessary, as
people can link to the glossary entry or the abc module without it.
Two indentation fixes from 3.2 collections.rst have been ported to 3.3
collections.abc.rst.
Diffstat (limited to 'Doc/glossary.rst')
| -rw-r--r-- | Doc/glossary.rst | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 1042a81..2961af1 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -27,12 +27,14 @@ Glossary :ref:`2to3-reference`. abstract base class - :ref:`abstract-base-classes` complement :term:`duck-typing` by + Abstract base classes complement :term:`duck-typing` by providing a way to define interfaces when other techniques like - :func:`hasattr` would be clumsy. Python comes with many built-in ABCs for - data structures (in the :mod:`collections` module), numbers (in the - :mod:`numbers` module), and streams (in the :mod:`io` module). You can - create your own ABC with the :mod:`abc` module. + :func:`hasattr` would be clumsy or subtly wrong (for example with + :ref:`magic methods <special-lookup>`). Python comes with many built-in ABCs for + data structures (in the :mod:`collections.abc` module), numbers (in the + :mod:`numbers` module), streams (in the :mod:`io` module), import finders + and loaders (in the :mod:`importlib.abc` module). You can create your own + ABCs with the :mod:`abc` module. argument A value passed to a function or method, assigned to a named local @@ -430,8 +432,8 @@ Glossary mapping 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`, + :ref:`abstract base classes <collections-abstract-base-classes>`. Examples + include :class:`dict`, :class:`collections.defaultdict`, :class:`collections.OrderedDict` and :class:`collections.Counter`. metaclass |