merge 3.4 (#21105)

benjaminp · benjaminp · commit ba6eba0850ab · 2014-03-30T15:07:25.000-04:00
diff --git a/Doc/library/functools.rst b/Doc/library/functools.rst
@@ -218,6 +218,8 @@ The :mod:`functools` module defines the following functions:
    Example::
 
       >>> class Cell(object):
+      ...     def __init__(self):
+      ...         self._alive = False
       ...     @property
       ...     def alive(self):
       ...         return self._alive
