summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-05-01 22:39:52 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-05-01 22:39:52 (GMT)
commit47583fa9b4113accd43efc8c205586cd956405a6 (patch)
tree11e8678dd966d12c596ff2d34d49913851782de0 /Doc
parentd23820b7c92e0c7810138db6e9937112a438c636 (diff)
parentcee01bf18faa9eb95b93c24711cbebbe36d91336 (diff)
downloadcpython-47583fa9b4113accd43efc8c205586cd956405a6.zip
cpython-47583fa9b4113accd43efc8c205586cd956405a6.tar.gz
cpython-47583fa9b4113accd43efc8c205586cd956405a6.tar.bz2
merge 3.2
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/stdtypes.rst10
1 files changed, 7 insertions, 3 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 2415e39..af594ec 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -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()