merge 3.4 (#21105)

2014-03-30 15:07:25 -04:00 · 2014-03-30 15:07:25 -04:00 · ba6eba0850
parent 6e50ccd303 3a4340325b
commit ba6eba0850
1 changed files with 2 additions and 0 deletions
--- 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