summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorGustavo Niemeyer <gustavo@niemeyer.net>2007-01-10 16:13:40 (GMT)
committerGustavo Niemeyer <gustavo@niemeyer.net>2007-01-10 16:13:40 (GMT)
commita443bc8ec789b2818a820a49cbdab7e1369baeb5 (patch)
tree273a4bedb21632c95e992856211f19e71b7d150b /Objects
parent85a2192bb6e3646e3e18200f708a01973e677bae (diff)
downloadcpython-a443bc8ec789b2818a820a49cbdab7e1369baeb5.zip
cpython-a443bc8ec789b2818a820a49cbdab7e1369baeb5.tar.gz
cpython-a443bc8ec789b2818a820a49cbdab7e1369baeb5.tar.bz2
Mention in the int() docstring that a base zero has meaning, as
stated in http://docs.python.org/lib/built-in-funcs.html as well.
Diffstat (limited to 'Objects')
-rw-r--r--Objects/intobject.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/Objects/intobject.c b/Objects/intobject.c
index 8aa8d0b..dedc477 100644
--- a/Objects/intobject.c
+++ b/Objects/intobject.c
@@ -1070,8 +1070,9 @@ Convert a string or number to an integer, if possible. A floating point\n\
argument will be truncated towards zero (this does not include a string\n\
representation of a floating point number!) When converting a string, use\n\
the optional base. It is an error to supply a base when converting a\n\
-non-string. If the argument is outside the integer range a long object\n\
-will be returned instead.");
+non-string. If base is zero, the proper base is guessed based on the\n\
+string content. If the argument is outside the integer range a\n\
+long object will be returned instead.");
static PyNumberMethods int_as_number = {
(binaryfunc)int_add, /*nb_add*/