summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-05-01 22:39:40 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-05-01 22:39:40 (GMT)
commitcee01bf18faa9eb95b93c24711cbebbe36d91336 (patch)
treecdd525f01116f038d1d4a603679a9d1d5ccb9fa0 /Doc
parent5cf93c68859ed96e776c98081ab7104614ffdbf8 (diff)
parent10116d40d8794825c42b2440524411cd406d1f93 (diff)
downloadcpython-cee01bf18faa9eb95b93c24711cbebbe36d91336.zip
cpython-cee01bf18faa9eb95b93c24711cbebbe36d91336.tar.gz
cpython-cee01bf18faa9eb95b93c24711cbebbe36d91336.tar.bz2
merge 3.1
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 72f93be..5bb128b 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()