summaryrefslogtreecommitdiffstats
path: root/Doc/library/functions.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-08-06 15:06:25 (GMT)
committerGeorg Brandl <georg@python.org>2009-08-06 15:06:25 (GMT)
commit29bc2cd463e58dbc199ae846eb55b3a5cd9988a8 (patch)
treed07ef69f126672a7b78e3441cbb1616a3c8e882f /Doc/library/functions.rst
parent8497efeb4064be366a76e50a8650ed4b6dd3fd01 (diff)
downloadcpython-29bc2cd463e58dbc199ae846eb55b3a5cd9988a8.zip
cpython-29bc2cd463e58dbc199ae846eb55b3a5cd9988a8.tar.gz
cpython-29bc2cd463e58dbc199ae846eb55b3a5cd9988a8.tar.bz2
Fix base keyword arg name for int() and long().
Diffstat (limited to 'Doc/library/functions.rst')
-rw-r--r--Doc/library/functions.rst13
1 files changed, 7 insertions, 6 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 5fd8114..56cc97a 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -540,15 +540,15 @@ available. They are listed here in alphabetical order.
Consider using the :func:`raw_input` function for general input from users.
-.. function:: int([x[, radix]])
+.. function:: int([x[, base]])
Convert a string or number to a plain integer. If the argument is a string,
it must contain a possibly signed decimal number representable as a Python
- integer, possibly embedded in whitespace. The *radix* parameter gives the
+ integer, possibly embedded in whitespace. The *base* parameter gives the
base for the conversion (which is 10 by default) and may be any integer in
- the range [2, 36], or zero. If *radix* is zero, the proper radix is
+ the range [2, 36], or zero. If *base* is zero, the proper radix is
determined based on the contents of string; the interpretation is the same as
- for integer literals. (See :ref:`numbers`.) If *radix* is specified and *x*
+ for integer literals. (See :ref:`numbers`.) If *base* is specified and *x*
is not a string, :exc:`TypeError` is raised. Otherwise, the argument may be a
plain or long integer or a floating point number. Conversion of floating
point numbers to integers truncates (towards zero). If the argument is
@@ -643,11 +643,11 @@ available. They are listed here in alphabetical order.
interpreter. Free variables are not returned in class blocks.
-.. function:: long([x[, radix]])
+.. function:: long([x[, base]])
Convert a string or number to a long integer. If the argument is a string, it
must contain a possibly signed number of arbitrary size, possibly embedded in
- whitespace. The *radix* argument is interpreted in the same way as for
+ whitespace. The *base* argument is interpreted in the same way as for
:func:`int`, and may only be given when *x* is a string. Otherwise, the argument
may be a plain or long integer or a floating point number, and a long integer
with the same value is returned. Conversion of floating point numbers to
@@ -655,6 +655,7 @@ available. They are listed here in alphabetical order.
The long type is described in :ref:`typesnumeric`.
+
.. function:: map(function, iterable, ...)
Apply *function* to every item of *iterable* and return a list of the results.