[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4: Fix text about int() with octal numbers. Closes #21212.

eric.smith python-checkins at python.org
Mon Apr 14 13:46:47 CEST 2014


http://hg.python.org/cpython/rev/6107a727c60a
changeset:   90243:6107a727c60a
parent:      90241:d1eba2645b80
parent:      90242:fb7bc8fe0d49
user:        Eric V. Smith <eric at trueblade.com>
date:        Mon Apr 14 07:46:21 2014 -0400
summary:
  Merge 3.4: Fix text about int() with octal numbers. Closes #21212.

files:
  Doc/faq/programming.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -711,7 +711,7 @@
 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

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list