diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2011-10-11 17:54:03 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-10-11 17:54:03 (GMT) |
commit | 60dd7dc23c37bbb1c6ecc83a866f1a379afce443 (patch) | |
tree | 42d2b6fd7842c27b38151f533e298f2a6613ee0f | |
parent | bb0ad4cfa17a027e0416d6cafdea9387881c5614 (diff) | |
parent | 1c027e564f9683584bfa4db8a0442a11e3ae13e1 (diff) | |
download | cpython-60dd7dc23c37bbb1c6ecc83a866f1a379afce443.zip cpython-60dd7dc23c37bbb1c6ecc83a866f1a379afce443.tar.gz cpython-60dd7dc23c37bbb1c6ecc83a866f1a379afce443.tar.bz2 |
Merge
-rw-r--r-- | Doc/c-api/number.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/c-api/number.rst b/Doc/c-api/number.rst index 090fc64..21951c3 100644 --- a/Doc/c-api/number.rst +++ b/Doc/c-api/number.rst @@ -239,10 +239,10 @@ Number Protocol .. c:function:: PyObject* PyNumber_ToBase(PyObject *n, int base) - Returns the integer *n* converted to *base* as a string with a base - marker of ``'0b'``, ``'0o'``, or ``'0x'`` if applicable. When - *base* is not 2, 8, 10, or 16, the format is ``'x#num'`` where x is the - base. If *n* is not an int object, it is converted with + Returns the integer *n* converted to base *base* as a string. The *base* + argument must be one of 2, 8, 10, or 16. For base 2, 8, or 16, the + returned string is prefixed with a base marker of ``'0b'``, ``'0o'``, or + ``'0x'``, respectively. If *n* is not a Python int, it is converted with :c:func:`PyNumber_Index` first. |