diff options
author | Éric Araujo <merwok@netwok.org> | 2011-06-06 15:12:29 (GMT) |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2011-06-06 15:12:29 (GMT) |
commit | e77535c90b0483d8cec913cca4b0628974a9f06e (patch) | |
tree | 538e352f514aacce0793ac3cc14ff49301f3acdc /Doc/library | |
parent | 9f0df8bdb8497674709f1e0494dbb885b898d7ee (diff) | |
parent | a69ade81be00270bd613f7e5e4f999f5d7bc304b (diff) | |
download | cpython-e77535c90b0483d8cec913cca4b0628974a9f06e.zip cpython-e77535c90b0483d8cec913cca4b0628974a9f06e.tar.gz cpython-e77535c90b0483d8cec913cca4b0628974a9f06e.tar.bz2 |
Branch merge
Diffstat (limited to 'Doc/library')
-rw-r--r-- | Doc/library/abc.rst | 4 | ||||
-rw-r--r-- | Doc/library/collections.abc.rst | 8 | ||||
-rw-r--r-- | Doc/library/numbers.rst | 6 |
3 files changed, 8 insertions, 10 deletions
diff --git a/Doc/library/abc.rst b/Doc/library/abc.rst index 3e38cb4..030d286 100644 --- a/Doc/library/abc.rst +++ b/Doc/library/abc.rst @@ -1,5 +1,3 @@ -.. _abstract-base-classes: - :mod:`abc` --- Abstract Base Classes ==================================== @@ -20,7 +18,7 @@ regarding a type hierarchy for numbers based on ABCs.) The :mod:`collections` module has some concrete classes that derive from ABCs; these can, of course, be further derived. In addition the -:mod:`collections` module has some ABCs that can be used to test whether +:mod:`collections.abc` submodule has some ABCs that can be used to test whether a class or instance provides a particular interface, for example, is it hashable or a mapping. diff --git a/Doc/library/collections.abc.rst b/Doc/library/collections.abc.rst index 1d451d1..dbd89ae 100644 --- a/Doc/library/collections.abc.rst +++ b/Doc/library/collections.abc.rst @@ -44,7 +44,7 @@ ABC Inherits from Abstract Methods Mixin :class:`Iterable`, ``index``, and ``count`` :class:`Container` -:class:`MutableSequence` :class:`Sequence` ``__setitem__`` Inherited :class:`Sequence` methods and +:class:`MutableSequence` :class:`Sequence` ``__setitem__``, Inherited :class:`Sequence` methods and ``__delitem__``, ``append``, ``reverse``, ``extend``, ``pop``, ``insert`` ``remove``, ``clear``, and ``__iadd__`` @@ -175,7 +175,7 @@ Notes on using :class:`Set` and :class:`MutableSet` as a mixin: .. seealso:: - * `OrderedSet recipe <http://code.activestate.com/recipes/576694/>`_ that uses - :class:`MutableSet`. + * `OrderedSet recipe <http://code.activestate.com/recipes/576694/>`_ for an + example built on :class:`MutableSet`. - * For more about ABCs, see the :mod:`abc` module and :pep:`3119`. + * For more about ABCs, see the :mod:`abc` module and :pep:`3119`. diff --git a/Doc/library/numbers.rst b/Doc/library/numbers.rst index df8d521..ad33396 100644 --- a/Doc/library/numbers.rst +++ b/Doc/library/numbers.rst @@ -5,9 +5,9 @@ :synopsis: Numeric abstract base classes (Complex, Real, Integral, etc.). -The :mod:`numbers` module (:pep:`3141`) defines a hierarchy of numeric abstract -base classes which progressively define more operations. None of the types -defined in this module can be instantiated. +The :mod:`numbers` module (:pep:`3141`) defines a hierarchy of numeric +:term:`abstract base classes <abstract base class>` which progressively define +more operations. None of the types defined in this module can be instantiated. .. class:: Number |