summaryrefslogtreecommitdiffstats
path: root/Doc/library/functions.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-05-11 14:30:18 (GMT)
committerGeorg Brandl <georg@python.org>2008-05-11 14:30:18 (GMT)
commit95817b36f0310f21fa2ec4099db72596b3442c13 (patch)
treeef148aec01d7bd43ba57875cce9620d8a8fd7d73 /Doc/library/functions.rst
parent6e6dcb5719cd3fec7a917e3d7954247305d8e50d (diff)
downloadcpython-95817b36f0310f21fa2ec4099db72596b3442c13.zip
cpython-95817b36f0310f21fa2ec4099db72596b3442c13.tar.gz
cpython-95817b36f0310f21fa2ec4099db72596b3442c13.tar.bz2
Remove mentions of "plain" integers.
Diffstat (limited to 'Doc/library/functions.rst')
-rw-r--r--Doc/library/functions.rst43
1 files changed, 22 insertions, 21 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index ff6069d..4689985 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -429,13 +429,13 @@ are always available. They are listed here in alphabetical order.
.. function:: float([x])
- Convert a string or a number to floating point. If the argument is a string, it
- must contain a possibly signed decimal or floating point number, possibly
- embedded in whitespace. The argument may also be [+|-]nan or [+|-]inf.
- Otherwise, the argument may be a plain integer
- or a floating point number, and a floating point number with the same value
- (within Python's floating point precision) is returned. If no argument is
- given, returns ``0.0``.
+ Convert a string or a number to floating point. If the argument is a string,
+ it must contain a possibly signed decimal or floating point number, possibly
+ embedded in whitespace. The argument may also be ``'[+|-]nan'`` or
+ ``'[+|-]inf'``. Otherwise, the argument may be an integer or a floating
+ point number, and a floating point number with the same value (within
+ Python's floating point precision) is returned. If no argument is given,
+ ``0.0`` is returned.
.. note::
@@ -443,11 +443,12 @@ are always available. They are listed here in alphabetical order.
single: NaN
single: Infinity
- When passing in a string, values for NaN and Infinity may be returned, depending
- on the underlying C library. Float accepts the strings nan, inf and -inf for
- NaN and positive or negative infinity. The case and a leading + are ignored as
- well as a leading - is ignored for NaN. Float always represents NaN and infinity
- as nan, inf or -inf.
+ When passing in a string, values for NaN and Infinity may be returned,
+ depending on the underlying C library. Float accepts the strings
+ ``'nan'``, ``'inf'`` and ``'-inf'`` for NaN and positive or negative
+ infinity. The case and a leading + are ignored as well as a leading - is
+ ignored for NaN. Float always represents NaN and infinity as ``nan``,
+ ``inf`` or ``-inf``.
The float type is described in :ref:`typesnumeric`.
@@ -873,15 +874,15 @@ are always available. They are listed here in alphabetical order.
.. XXX does accept objects with __index__ too
.. function:: range([start,] stop[, step])
- This is a versatile function to create lists containing arithmetic progressions.
- It is most often used in :keyword:`for` loops. The arguments must be plain
- integers. If the *step* argument is omitted, it defaults to ``1``. If the
- *start* argument is omitted, it defaults to ``0``. The full form returns a list
- of plain integers ``[start, start + step, start + 2 * step, ...]``. If *step*
- is positive, the last element is the largest ``start + i * step`` less than
- *stop*; if *step* is negative, the last element is the smallest ``start + i *
- step`` greater than *stop*. *step* must not be zero (or else :exc:`ValueError`
- is raised). Example:
+ This is a versatile function to create iterators yielding arithmetic
+ progressions. It is most often used in :keyword:`for` loops. The arguments
+ must be integers. If the *step* argument is omitted, it defaults to ``1``.
+ If the *start* argument is omitted, it defaults to ``0``. The full form
+ returns an iterator of integers ``[start, start + step, start + 2 * step,
+ ...]``. If *step* is positive, the last element is the largest ``start + i *
+ step`` less than *stop*; if *step* is negative, the last element is the
+ smallest ``start + i * step`` greater than *stop*. *step* must not be zero
+ (or else :exc:`ValueError` is raised). Example:
>>> list(range(10))
[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]