[Python-checkins] cpython (merge 3.2 -> default): Issue #13365: correct an error in the documentation of str.expandtabs. Patch by

[eli.bendersky]

http://hg.python.org/cpython/rev/25191fe10da9
changeset:   73492:25191fe10da9
parent:      73490:05164831011e
parent:      73491:84f803fdc0d2
user:        Eli Bendersky <eliben at gmail.com>
date:        Fri Nov 11 10:44:22 2011 +0200
summary:
  Issue #13365: correct an error in the documentation of str.expandtabs. Patch by John Feuerstein

files:
  Doc/library/stdtypes.rst |  2 +-
  Misc/ACKS                |  1 +
  2 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1037,7 +1037,7 @@
 
 .. method:: str.expandtabs([tabsize])
 
-   Return a copy of the string where all tab characters are replaced by one or
+   Return a copy of the string where all tab characters are replaced by zero or
    more spaces, depending on the current column and the given tab size.  The
    column number is reset to zero after each newline occurring in the string.
    If *tabsize* is not given, a tab size of ``8`` characters is assumed.  This
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -306,6 +306,7 @@
 Niels Ferguson
 Sebastian Fernandez
 Florian Festi
+John Feuerstein
 Vincent Fiack
 Tomer Filiba
 Jeffrey Finkelstein

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