[Python-checkins] cpython (merge 3.2 -> 3.2): Branch merge
eric.araujo
python-checkins at python.org
Mon Jun 6 17:14:16 CEST 2011
http://hg.python.org/cpython/rev/1a1522f612b0
changeset: 70686:1a1522f612b0
branch: 3.2
parent: 70646:52405ec0c8d1
parent: 70669:51973a0776f9
user: Éric Araujo <merwok at netwok.org>
date: Mon Jun 06 17:11:47 2011 +0200
summary:
Branch merge
files:
Doc/glossary.rst | 14 ++++++++------
Doc/library/abc.rst | 2 +-
Doc/library/collections.rst | 10 ++++------
Doc/library/numbers.rst | 6 +++---
Lib/distutils/tests/Setup.sample | Bin
Lib/distutils/tests/test_extension.py | Bin
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -27,12 +27,14 @@
: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
+ :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` 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.
+ :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 @@
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
diff --git a/Doc/library/abc.rst b/Doc/library/abc.rst
--- a/Doc/library/abc.rst
+++ b/Doc/library/abc.rst
@@ -12,7 +12,7 @@
--------------
This module provides the infrastructure for defining an :term:`abstract base
-class` (ABCs) in Python, as outlined in :pep:`3119`; see the PEP for why this
+class` (ABC) in Python, as outlined in :pep:`3119`; see the PEP for why this
was added to Python. (See also :pep:`3141` and the :mod:`numbers` module
regarding a type hierarchy for numbers based on ABCs.)
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -33,8 +33,9 @@
===================== ====================================================================
In addition to the concrete container classes, the collections module provides
-:ref:`abstract-base-classes` that can be used to test whether a class provides a
-particular interface, for example, whether it is hashable or a mapping.
+:ref:`abstract base classes <collections-abstract-base-classes>` that can be
+used to test whether a class provides a particular interface, for example,
+whether it is hashable or a mapping.
:class:`Counter` objects
@@ -984,7 +985,7 @@
subclass) or an arbitrary sequence which can be converted into a string using
the built-in :func:`str` function.
-.. _abstract-base-classes:
+.. _collections-abstract-base-classes:
ABCs - abstract base classes
----------------------------
@@ -1136,9 +1137,6 @@
.. seealso::
- * Latest version of the :source:`Python source code for the collections
- abstract base classes <Lib/_abcoll.py>`
-
* `OrderedSet recipe <http://code.activestate.com/recipes/576694/>`_ for an
example built on :class:`MutableSet`.
diff --git a/Doc/library/numbers.rst b/Doc/library/numbers.rst
--- 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
diff --git a/Lib/distutils/tests/Setup.sample b/Lib/distutils/tests/Setup.sample
old mode 100755
new mode 100644
diff --git a/Lib/distutils/tests/test_extension.py b/Lib/distutils/tests/test_extension.py
old mode 100755
new mode 100644
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list