[Python-checkins] r71124 - in python/branches/release26-maint: Doc/library/future_builtins.rst

Sat Apr 4 08:43:40 CEST 2009

Author: r.david.murray
Date: Sat Apr 4 08:43:39 2009
New Revision: 71124
Log:
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 (2009年4月04日) | 2 lines
 
 Fix error in description of 'oct' (issue 5678).
........
Modified:
 python/branches/release26-maint/ (props changed)
 python/branches/release26-maint/Doc/library/future_builtins.rst
Modified: python/branches/release26-maint/Doc/library/future_builtins.rst
==============================================================================

--- python/branches/release26-maint/Doc/library/future_builtins.rst	(original)
+++ python/branches/release26-maint/Doc/library/future_builtins.rst	Sat Apr 4 08:43:39 2009
@@ -54,7 +54,7 @@
 
 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)
 
