[Python-checkins] cpython (merge 2.7 -> 2.7): Branch merge

[eric.araujo]

http://hg.python.org/cpython/rev/11fb5b7be8cd
changeset:   77926:11fb5b7be8cd
branch:      2.7
parent:      77925:a56cebff113a
parent:      77921:d32f21d87363
user:        Éric Araujo <merwok at netwok.org>
date:        Tue Jul 03 01:13:40 2012 -0400
summary:
  Branch merge

files:
  Doc/library/itertools.rst |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst
--- a/Doc/library/itertools.rst
+++ b/Doc/library/itertools.rst
@@ -733,7 +733,8 @@
        return izip(a, b)
 
    def grouper(n, iterable, fillvalue=None):
-       "grouper(3, 'ABCDEFG', 'x') --> ABC DEF Gxx"
+       "Collect data into fixed-length chunks or blocks"
+       # grouper(3, 'ABCDEFG', 'x') --> ABC DEF Gxx"
        args = [iter(iterable)] * n
        return izip_longest(fillvalue=fillvalue, *args)
 

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