From: R. David Murray Date: Sat, 4 Apr 2009 06:43:39 +0000 (+0000) Subject: Merged revisions 71123 via svnmerge from X-Git-Tag: v2.6.2c1~30 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9da90a74e0df57c8562723139d30adf78faac6f;p=thirdparty%2FPython%2Fcpython.git Merged revisions 71123 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r71123 | r.david.murray | 2009-04-04 02:39:56 -0400 (Sat, 04 Apr 2009) | 2 lines Fix error in description of 'oct' (issue 5678). ........ --- diff --git a/Doc/library/future_builtins.rst b/Doc/library/future_builtins.rst index 6a1fdab5c573..7ee7110f6306 100644 --- a/Doc/library/future_builtins.rst +++ b/Doc/library/future_builtins.rst @@ -54,7 +54,7 @@ Available builtins are: Works like the builtin :func:`oct`, but instead of :meth:`__oct__` it will use the :meth:`__index__` method on its argument to get an integer that is - then converted to hexadecimal. + then converted to octal. .. function:: zip(*iterables)