]> granicus.if.org Git - python/commitdiff
Use consistent note numbers.
authorGeorg Brandl <georg@python.org>
Sun, 6 Jan 2008 17:39:49 +0000 (17:39 +0000)
committerGeorg Brandl <georg@python.org>
Sun, 6 Jan 2008 17:39:49 +0000 (17:39 +0000)
Doc/library/stdtypes.rst

index fc96f45ec8539ea57ff14d2ca1e8919a795b44bf..8e81db888458e1c08345d58a247994c9c6b86155 100644 (file)
@@ -303,7 +303,7 @@ numeric operations have a higher priority than comparison operations):
 +---------------------+---------------------------------+-------+--------------------+
 | ``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`    |
 |                     | *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`     |
 +---------------------+---------------------------------+-------+--------------------+
-| ``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::
@@ -347,11 +347,11 @@ Notes:
    as in C; see functions :func:`floor` and :func:`ceil` in the :mod:`math` module
    for well-defined conversions.
 
-(6)
+(4)
    float also accepts the strings "nan" and "inf" with an optional prefix "+" 
    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
    programming languages.