[Python-checkins] cpython (merge 3.3 -> default): merge

[raymond.hettinger]

http://hg.python.org/cpython/rev/8f8c614dc284
changeset:   85635:8f8c614dc284
parent:      85632:fa1fa88b685b
parent:      85634:29fa1f418796
user:        Raymond Hettinger <python at rcn.com>
date:        Mon Sep 09 01:55:07 2013 -0500
summary:
  merge

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


diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst
--- a/Doc/library/itertools.rst
+++ b/Doc/library/itertools.rst
@@ -157,9 +157,8 @@
 .. classmethod:: chain.from_iterable(iterable)
 
    Alternate constructor for :func:`chain`.  Gets chained inputs from a
-   single iterable argument that is evaluated lazily.  Equivalent to::
+   single iterable argument that is evaluated lazily.  Roughly equivalent to::
 
-      @classmethod
       def from_iterable(iterables):
           # chain.from_iterable(['ABC', 'DEF']) --> A B C D E F
           for it in iterables:

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