[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3
georg.brandl
python-checkins at python.org
Sun Apr 14 11:59:08 CEST 2013
http://hg.python.org/cpython/rev/50e87547b57a
changeset: 83355:50e87547b57a
parent: 83352:8fe5a98647a0
parent: 83354:1d4ba14cc505
user: Georg Brandl <georg at python.org>
date: Sun Apr 14 11:59:19 2013 +0200
summary:
merge with 3.3
files:
Doc/library/numbers.rst | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Doc/library/numbers.rst b/Doc/library/numbers.rst
--- a/Doc/library/numbers.rst
+++ b/Doc/library/numbers.rst
@@ -71,10 +71,10 @@
.. 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
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list