diff options
| author | Eric V. Smith <eric@trueblade.com> | 2014-04-14 07:46:21 -0400 |
|---|---|---|
| committer | Eric V. Smith <eric@trueblade.com> | 2014-04-14 07:46:21 -0400 |
| commit | ad8d142c0f2ccae23e543b5e4b382f485c2151d3 (patch) | |
| tree | b2376d7dec07f3eeead94d3d34784f569d2086da | |
| parent | a548a30fed74819c4b1411dde4f07944770b5df4 (diff) | |
| parent | fc9a4d828ebdbd2a5e62c93943e9948320323c72 (diff) | |
| download | cpython-git-ad8d142c0f2ccae23e543b5e4b382f485c2151d3.tar.gz | |
Merge 3.4: Fix text about int() with octal numbers. Closes #21212.
| -rw-r--r-- | Doc/faq/programming.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index d514a80e4a..9f49ba8851 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -711,7 +711,7 @@ By default, these interpret the number as decimal, so that ``int('0144') == 144`` and ``int('0x144')`` raises :exc:`ValueError`. ``int(string, base)`` takes the base to convert from as a second optional argument, so ``int('0x144', 16) == 324``. If the base is specified as 0, the number is interpreted using Python's -rules: a leading '0' indicates octal, and '0x' indicates a hex number. +rules: a leading '0o' indicates octal, and '0x' indicates a hex number. Do not use the built-in function :func:`eval` if all you need is to convert strings to numbers. :func:`eval` will be significantly slower and it presents a |