Use consistent note numbers.

This commit is contained in:
Georg Brandl 2008-01-06 17:39:49 +00:00
parent a6fa2728fb
commit 74f36691db

View file

@ -303,7 +303,7 @@ numeric operations have a higher priority than comparison operations):
+---------------------+---------------------------------+-------+--------------------+ +---------------------+---------------------------------+-------+--------------------+
| ``int(x)`` | *x* converted to integer | \(3) | :func:`int` | | ``int(x)`` | *x* converted to integer | \(3) | :func:`int` |
+---------------------+---------------------------------+-------+--------------------+ +---------------------+---------------------------------+-------+--------------------+
| ``float(x)`` | *x* converted to floating point | \(6) | :func:`float` | | ``float(x)`` | *x* converted to floating point | \(4) | :func:`float` |
+---------------------+---------------------------------+-------+--------------------+ +---------------------+---------------------------------+-------+--------------------+
| ``complex(re, im)`` | a complex number with real part | | :func:`complex` | | ``complex(re, im)`` | a complex number with real part | | :func:`complex` |
| | *re*, imaginary part *im*. | | | | | *re*, imaginary part *im*. | | |
@ -314,9 +314,9 @@ numeric operations have a higher priority than comparison operations):
+---------------------+---------------------------------+-------+--------------------+ +---------------------+---------------------------------+-------+--------------------+
| ``divmod(x, y)`` | the pair ``(x // y, x % y)`` | \(2) | :func:`divmod` | | ``divmod(x, y)`` | the pair ``(x // y, x % y)`` | \(2) | :func:`divmod` |
+---------------------+---------------------------------+-------+--------------------+ +---------------------+---------------------------------+-------+--------------------+
| ``pow(x, y)`` | *x* to the power *y* | (7) | :func:`pow` | | ``pow(x, y)`` | *x* to the power *y* | (5) | :func:`pow` |
+---------------------+---------------------------------+-------+--------------------+ +---------------------+---------------------------------+-------+--------------------+
| ``x ** y`` | *x* to the power *y* | (7) | | | ``x ** y`` | *x* to the power *y* | (5) | |
+---------------------+---------------------------------+-------+--------------------+ +---------------------+---------------------------------+-------+--------------------+
.. index:: .. index::
@ -347,11 +347,11 @@ Notes:
as in C; see functions :func:`floor` and :func:`ceil` in the :mod:`math` module as in C; see functions :func:`floor` and :func:`ceil` in the :mod:`math` module
for well-defined conversions. for well-defined conversions.
(6) (4)
float also accepts the strings "nan" and "inf" with an optional prefix "+" float also accepts the strings "nan" and "inf" with an optional prefix "+"
or "-" for Not a Number (NaN) and positive or negative infinity. or "-" for Not a Number (NaN) and positive or negative infinity.
(7) (5)
Python defines ``pow(0, 0)`` and ``0 ** 0`` to be ``1``, as is common for Python defines ``pow(0, 0)`` and ``0 ** 0`` to be ``1``, as is common for
programming languages. programming languages.