mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #14783: Merge changes from 3.2.

Browse source
This commit is contained in:
Chris Jerdonek 2012-10-07 14:56:27 -07:00
commit 042fa653ab
6 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Objects/longobject.c
View file

@ -4848,13 +4848,20 @@ static PyGetSetDef long_getset[] = {
};
PyDoc_STRVAR(long_doc,
"int(x[, base]) -> integer\n\
"int(x=0) -> integer\n\
int(x, base=10) -> integer\n\
\n\
Convert a string or number to an integer, if possible. A floating\n\
point argument will be truncated towards zero (this does not include a\n\
string representation of a floating point number!) When converting a\n\
string, use the optional base. It is an error to supply a base when\n\
converting a non-string.");
Convert a number or string to an integer, or return 0 if no arguments\n\
are given. If x is a number, return x.__int__(). For floating point\n\
numbers, this truncates towards zero.\n\
\n\
If x is not a number or if base is given, then x must be a string,\n\
bytes, or bytearray instance representing an integer literal in the\n\
given base. The literal can be preceded by '+' or '-' and be surrounded\n\
by whitespace. The base defaults to 10. Valid bases are 0 and 2-36.\n\
Base 0 means to interpret the base from the string as an integer literal.\n\
>>> int('0b100', base=0)\n\
4");
static PyNumberMethods long_as_number = {
(binaryfunc)long_add, /*nb_add*/