merge 3.1

This commit is contained in:
Benjamin Peterson 2011-05-01 17:39:40 -05:00
commit cee01bf18f
1 changed files with 7 additions and 3 deletions

View File

@ -354,8 +354,8 @@ Notes:
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 @@ Notes:
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 Integer Types
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()