summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-04-14 09:59:19 (GMT)
committerGeorg Brandl <georg@python.org>2013-04-14 09:59:19 (GMT)
commite827ea866d811fd58aa5aec0786e76e18217c368 (patch)
tree0da06250c420eaaae3807086f97dde5d2440bc36
parent015427e6594ed21a6d11f9ee982d16fca9d16c04 (diff)
parent1e1134a314cdf2fa3bf154d638bf2506182ca31b (diff)
downloadcpython-e827ea866d811fd58aa5aec0786e76e18217c368.zip
cpython-e827ea866d811fd58aa5aec0786e76e18217c368.tar.gz
cpython-e827ea866d811fd58aa5aec0786e76e18217c368.tar.bz2
merge with 3.3
-rw-r--r--Doc/library/numbers.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/numbers.rst b/Doc/library/numbers.rst
index ad33396..fec04ed 100644
--- a/Doc/library/numbers.rst
+++ b/Doc/library/numbers.rst
@@ -71,10 +71,10 @@ The numeric tower
.. class:: Integral
- Subtypes :class:`Rational` and adds a conversion to :class:`int`.
- Provides defaults for :func:`float`, :attr:`~Rational.numerator`, and
- :attr:`~Rational.denominator`, and bit-string operations: ``<<``,
- ``>>``, ``&``, ``^``, ``|``, ``~``.
+ Subtypes :class:`Rational` and adds a conversion to :class:`int`. Provides
+ defaults for :func:`float`, :attr:`~Rational.numerator`, and
+ :attr:`~Rational.denominator`. Adds abstract methods for ``**`` and
+ bit-string operations: ``<<``, ``>>``, ``&``, ``^``, ``|``, ``~``.
Notes for type implementors