merge 3.4 (#21105)

ba6eba08 · Benjamin Peterson · 6e50ccd3 · 3a434032 · ba6eba08
Commit ba6eba08 authored Mar 30, 2014 by Benjamin Peterson
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

Doc/library/functools.rst Doc/library/functools.rst +2 -0

No files found.
--- 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