[Python-checkins] cpython (merge 3.1 -> 3.2): merge 3.1

[benjamin.peterson]

http://hg.python.org/cpython/rev/e35e51d4e28c
changeset:   69751:e35e51d4e28c
branch:      3.2
parent:      69746:a17f5c787cc0
parent:      69749:dc65d1b99dff
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun May 01 17:39:40 2011 -0500
summary:
  merge 3.1

files:
  Doc/library/stdtypes.rst |  10 +++++++---
  1 files changed, 7 insertions(+), 3 deletions(-)


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -354,8 +354,8 @@
    for a complete list of code points with the ``Nd`` property.
 
 
-All :class:`numbers.Real` types (:class:`int` and
-:class:`float`) also include the following operations:
+All :class:`numbers.Real` types (:class:`int` and :class:`float`) also include
+the following operations:
 
 +--------------------+------------------------------------+--------+
 | Operation          | Result                             | Notes  |
@@ -439,6 +439,9 @@
 Additional Methods on Integer Types
 -----------------------------------
 
+The int type implements the :class:`numbers.Integral` :term:`abstact base
+class`. In addition, it provides one more method
+
 .. method:: int.bit_length()
 
     Return the number of bits necessary to represent an integer in binary,
@@ -532,7 +535,8 @@
 Additional Methods on Float
 ---------------------------
 
-The float type has some additional methods.
+The float type implements the :class:`numbers.Real` :term:`abstract base
+class`. float also has the following additional methods.
 
 .. method:: float.as_integer_ratio()
 

-- 
Repository URL: http://hg.python.org/cpython