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

[richard.oudkerk]

http://hg.python.org/cpython/rev/0cd35f4a0091
changeset:   78618:0cd35f4a0091
parent:      78615:357d78d739f9
parent:      78617:24b13be81d61
user:        Richard Oudkerk <shibturn at gmail.com>
date:        Fri Aug 17 15:05:09 2012 +0100
summary:
  Merge

files:
  Doc/library/weakref.rst |  6 ------
  1 files changed, 0 insertions(+), 6 deletions(-)


diff --git a/Doc/library/weakref.rst b/Doc/library/weakref.rst
--- a/Doc/library/weakref.rst
+++ b/Doc/library/weakref.rst
@@ -53,12 +53,6 @@
 directly.  The low-level machinery used by the weak dictionary implementations
 is exposed by the :mod:`weakref` module for the benefit of advanced uses.
 
-.. note::
-
-   Weak references to an object are cleared before the object's :meth:`__del__`
-   is called, to ensure that the weak reference callback (if any) finds the
-   object still alive.
-
 Not all objects can be weakly referenced; those objects which can include class
 instances, functions written in Python (but not in C), instance methods, sets,
 frozensets, some :term:`file objects <file object>`, :term:`generator`\s, type

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