Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #10610: Document that int(), float(), and complex() accept numeric literals with the Nd property.

This commit is contained in:
Raymond Hettinger 2011-03-22 17:34:28 -07:00
parent 941b2c99f6 b1aef23316
commit f59c7b2bdd
1 changed files with 46 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
Doc/library/stdtypes.rst
View File

@ -268,46 +268,46 @@ All numeric types (except complex) support the following operations, sorted by
ascending priority (operations in the same box have the same priority; all
numeric operations have a higher priority than comparison operations):
+---------------------+---------------------------------+-------+--------------------+
| Operation | Result | Notes | Full documentation |
+=====================+=================================+=======+====================+
| ``x + y`` | sum of *x* and *y* | | |
+---------------------+---------------------------------+-------+--------------------+
| ``x - y`` | difference of *x* and *y* | | |
+---------------------+---------------------------------+-------+--------------------+
| ``x * y`` | product of *x* and *y* | | |
+---------------------+---------------------------------+-------+--------------------+
| ``x / y`` | quotient of *x* and *y* | | |
+---------------------+---------------------------------+-------+--------------------+
| ``x // y`` | floored quotient of *x* and | \(1) | |
| | *y* | | |
+---------------------+---------------------------------+-------+--------------------+
| ``x % y`` | remainder of ``x / y`` | \(2) | |
+---------------------+---------------------------------+-------+--------------------+
| ``-x`` | *x* negated | | |
+---------------------+---------------------------------+-------+--------------------+
| ``+x`` | *x* unchanged | | |
+---------------------+---------------------------------+-------+--------------------+
| ``abs(x)`` | absolute value or magnitude of | | :func:`abs` |
| | *x* | | |
+---------------------+---------------------------------+-------+--------------------+
| ``int(x)`` | *x* converted to integer | \(3) | :func:`int` |
+---------------------+---------------------------------+-------+--------------------+
| ``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*. | | |
| | *im* defaults to zero. | | |
+---------------------+---------------------------------+-------+--------------------+
| ``c.conjugate()`` | conjugate of the complex number | | |
| | *c* | | |
+---------------------+---------------------------------+-------+--------------------+
| ``divmod(x, y)`` | the pair ``(x // y, x % y)`` | \(2) | :func:`divmod` |
+---------------------+---------------------------------+-------+--------------------+
| ``pow(x, y)`` | *x* to the power *y* | \(5) | :func:`pow` |
+---------------------+---------------------------------+-------+--------------------+
| ``x ** y`` | *x* to the power *y* | \(5) | |
+---------------------+---------------------------------+-------+--------------------+
+---------------------+---------------------------------+---------+--------------------+
| Operation | Result | Notes | Full documentation |
+=====================+=================================+=========+====================+
| ``x + y`` | sum of *x* and *y* | | |
+---------------------+---------------------------------+---------+--------------------+
| ``x - y`` | difference of *x* and *y* | | |
+---------------------+---------------------------------+---------+--------------------+
| ``x * y`` | product of *x* and *y* | | |
+---------------------+---------------------------------+---------+--------------------+
| ``x / y`` | quotient of *x* and *y* | | |
+---------------------+---------------------------------+---------+--------------------+
| ``x // y`` | floored quotient of *x* and | \(1) | |
| | *y* | | |
+---------------------+---------------------------------+---------+--------------------+
| ``x % y`` | remainder of ``x / y`` | \(2) | |
+---------------------+---------------------------------+---------+--------------------+
| ``-x`` | *x* negated | | |
+---------------------+---------------------------------+---------+--------------------+
| ``+x`` | *x* unchanged | | |
+---------------------+---------------------------------+---------+--------------------+
| ``abs(x)`` | absolute value or magnitude of | | :func:`abs` |
| | *x* | | |
+---------------------+---------------------------------+---------+--------------------+
| ``int(x)`` | *x* converted to integer | \(3)\(6)| :func:`int` |
+---------------------+---------------------------------+---------+--------------------+
| ``float(x)`` | *x* converted to floating point | \(4)\(6)| :func:`float` |
+---------------------+---------------------------------+---------+--------------------+
| ``complex(re, im)`` | a complex number with real part | \(6) | :func:`complex` |
| | *re*, imaginary part *im*. | | |
| | *im* defaults to zero. | | |
+---------------------+---------------------------------+---------+--------------------+
| ``c.conjugate()`` | conjugate of the complex number | | |
| | *c* | | |
+---------------------+---------------------------------+---------+--------------------+
| ``divmod(x, y)`` | the pair ``(x // y, x % y)`` | \(2) | :func:`divmod` |
+---------------------+---------------------------------+---------+--------------------+
| ``pow(x, y)`` | *x* to the power *y* | \(5) | :func:`pow` |
+---------------------+---------------------------------+---------+--------------------+
| ``x ** y`` | *x* to the power *y* | \(5) | |
+---------------------+---------------------------------+---------+--------------------+
.. index::
triple: operations on; numeric; types
@ -346,6 +346,12 @@ Notes:
Python defines ``pow(0, 0)`` and ``0 ** 0`` to be ``1``, as is common for
programming languages.
(6)
The numeric literals accepted include the digits ``0`` to ``9`` or any
Unicode equivalent (code points with the ``Nd`` property).
See http://www.unicode.org/Public/6.0.0/ucd/extracted/DerivedNumericType.txt
for a complete list of code points with the ``Nd`` property.
All :class:`numbers.Real` types (:class:`int` and