[pypy-commit] pypy default: merge default

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r45945:70435a5564da
Date: 2011-07-24 18:46 +0200
http://bitbucket.org/pypy/pypy/changeset/70435a5564da/

Log:	merge default

diff --git a/pypy/rpython/lltypesystem/rdict.py b/pypy/rpython/lltypesystem/rdict.py
--- a/pypy/rpython/lltypesystem/rdict.py
+++ b/pypy/rpython/lltypesystem/rdict.py
@@ -501,9 +501,6 @@
     ENTRY = ENTRIES.OF
     entry = d.entries[i]
     if ENTRIES.must_clear_key:
-        key = entry.key   # careful about destructor side effects:
-                          # keep key alive until entry.value has also
-                          # been zeroed (if it must be)
         entry.key = lltype.nullptr(ENTRY.key.TO)
     if ENTRIES.must_clear_value:
         entry.value = lltype.nullptr(ENTRY.value.TO)